From bee0055f9d33ec0e8cd307c7b087e64f96f7a750 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 26 十二月 2024 18:43:36 +0800
Subject: [PATCH] 1、一个springboot模块只能有一个listener,所以删除OrgListener.java 2、IC卡充值和消费日、月、年自动化统计,农户充值和消费日、月、年自动化统计中数据库查询一般返回list的bug修改

---
 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