From acdbf06288c8cbeac4abe3518e8157d753e72574 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 19 六月 2024 17:49: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 |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 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 3b870e8..1042061 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
@@ -51,8 +51,24 @@
     @ColumnWidth(30)
     private Date findDt;
 
-    @Schema(title = "鍦ㄧ嚎鐘舵��")
-    @ExcelProperty("鍦ㄧ嚎鐘舵��")
-    @ColumnWidth(6)
-    private String onlineState;
+//    @Schema(title = "鍦ㄧ嚎鐘舵��")
+//    @ExcelProperty("鍦ㄧ嚎鐘舵��")
+//    @ColumnWidth(6)
+//    private String onlineState;
+
+    /**
+     * 鏄惁鍦ㄧ嚎
+     */
+    private Boolean isOnLine;
+
+
+    @Schema(title = "閫氳鍗忚")
+    @ExcelProperty("閫氳鍗忚")
+    @ColumnWidth(10)
+    private String protocol;
+
+    @Schema(title = "澶囨敞")
+    @ExcelProperty("澶囨敞")
+    @ColumnWidth(10)
+    private String remarks;
 }

--
Gitblit v1.8.0