From 2507f1d9d720ffcc1a1ef1eed31a88db976c9abd Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 19 六月 2025 09:33:20 +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/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