From 3499fb29ae47b5db34d998002b0486facdb0f97c Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 19 一月 2024 17:27:42 +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 | 11 +++--------
1 files changed, 3 insertions(+), 8 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 2a35b3c..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
@@ -32,11 +32,6 @@
@ColumnWidth(15)
private String rtuAddr;
- @Schema(title = "鍦ㄧ嚎鐘舵��")
- @ExcelProperty("鍦ㄧ嚎鐘舵��")
- @ColumnWidth(15)
- private String onlineState;
-
@Schema(title = "缁戝畾鍙栨按鍙�")
@ExcelProperty("缁戝畾鍙栨按鍙�")
@ColumnWidth(10)
@@ -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