From 3d45d7d912b437bc1e281acc32fb313bee5dae1e Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 16 一月 2024 17:13:11 +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 | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 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 d5d4934..cdc8a43 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,10 @@
@ColumnWidth(10)
private Long id;
- @Schema(title = "鎺у埗鍣ㄧ紪鍙�")
- @ExcelProperty("鎺у埗鍣ㄧ紪鍙�")
+ @Schema(title = "鎺у埗鍣ㄥ湴鍧�")
+ @ExcelProperty("鎺у埗鍣ㄥ湴鍧�")
@ColumnWidth(15)
- private String controllerCode;
-
- @Schema(title = "鍦ㄧ嚎鐘舵��")
- @ExcelProperty("鍦ㄧ嚎鐘舵��")
- @ColumnWidth(15)
- private String onlineState;
+ private String rtuAddr;
@Schema(title = "缁戝畾鍙栨按鍙�")
@ExcelProperty("缁戝畾鍙栨按鍙�")
@@ -49,8 +44,8 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @Schema(title = "鏈�杩戜笂鎶ユ椂闂�")
- @ExcelProperty("鏈�杩戜笂鎶ユ椂闂�")
+ @Schema(title = "鍙戠幇鏃ユ湡鏃堕棿")
+ @ExcelProperty("鍙戠幇鏃ユ湡鏃堕棿")
@ColumnWidth(30)
- private Date reportTime;
+ private Date findDt;
}
--
Gitblit v1.8.0