From a39807064a500875d89bc46edcd2d0b3654575a9 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 24 七月 2024 15:14:46 +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