From 819a823876df35a253f2b9817277a36d70bbd956 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 11 六月 2024 15:55:07 +0800
Subject: [PATCH] 远程测控 返回全部取水口(在线、不在线)之前只返回在线的

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java
index 1a2d8af..28edc55 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoDivide.java
@@ -38,11 +38,16 @@
     @ColumnWidth(15)
     private String divideName;
 
-    @Schema(title = "鎵�灞炵墖鍖�")
-    @ExcelProperty("鎵�灞炵墖鍖�")
-    @ColumnWidth(15)
+    @Schema(title = "鎵�灞炵墖鍖篒D")
+    @ExcelProperty("鎵�灞炵墖鍖篒D")
+    @ColumnWidth(19)
     private String blockId;
 
+    @Schema(title = "鎵�灞炵墖鍖哄悕绉�")
+    @ExcelProperty("鎵�灞炵墖鍖哄悕绉�")
+    @ColumnWidth(15)
+    private String blockName;
+
     @Schema(title = "璐熻矗浜�")
     @ExcelProperty("璐熻矗浜�")
     @ColumnWidth(10)

--
Gitblit v1.8.0