From 3004cc4dbee1216a73277da7fbf9e519735e7587 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 16 一月 2024 15:18:47 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java
index 1d632e8..2a35b3c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java
@@ -27,15 +27,15 @@
@ColumnWidth(10)
private Long id;
- @Schema(title = "鎺у埗鍣ㄧ紪鍙�")
- @ExcelProperty("鎺у埗鍣ㄧ紪鍙�")
+ @Schema(title = "鎺у埗鍣ㄥ湴鍧�")
+ @ExcelProperty("鎺у埗鍣ㄥ湴鍧�")
@ColumnWidth(15)
- private String code;
+ private String rtuAddr;
@Schema(title = "鍦ㄧ嚎鐘舵��")
@ExcelProperty("鍦ㄧ嚎鐘舵��")
@ColumnWidth(15)
- private String state;
+ private String onlineState;
@Schema(title = "缁戝畾鍙栨按鍙�")
@ExcelProperty("缁戝畾鍙栨按鍙�")
@@ -45,12 +45,12 @@
@Schema(title = "缁戝畾娆℃暟")
@ExcelProperty("缁戝畾娆℃暟")
@ColumnWidth(10)
- private Integer bindings;
+ private Integer bindNumber;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Schema(title = "鏈�杩戜笂鎶ユ椂闂�")
@ExcelProperty("鏈�杩戜笂鎶ユ椂闂�")
@ColumnWidth(30)
- private Date operateDt;
+ private Date reportTime;
}
--
Gitblit v1.8.0