From d52c20ed07bcea2d848bdab25f2c49c21c00d269 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 27 二月 2024 12:56:22 +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 |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 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 5973c5c..207d0d9 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
@@ -1,5 +1,8 @@
 package com.dy.pipIrrGlobal.voPr;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.dy.common.po.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -18,28 +21,46 @@
 @Data
 @Schema(title = "鍒嗘按鎴胯鍥惧璞�")
 public class VoDivide implements BaseEntity {
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 202401241704004L;
 
     @Schema(title = "ID")
+    @ExcelProperty("ID")
+    @ColumnWidth(10)
     private Long id;
 
+    @Schema(title = "鍒嗘按鎴跨紪鍙�")
+    @ExcelProperty("鍒嗘按鎴跨紪鍙�")
+    @ColumnWidth(15)
+    private String divideId;
+
     @Schema(title = "鍒嗘按鎴垮悕绉�")
+    @ExcelProperty("鍒嗘按鎴垮悕绉�")
+    @ColumnWidth(15)
     private String divideName;
 
     @Schema(title = "鎵�灞炵墖鍖�")
+    @ExcelProperty("鎵�灞炵墖鍖�")
+    @ColumnWidth(15)
     private String blockName;
 
     @Schema(title = "璐熻矗浜�")
+    @ExcelProperty("璐熻矗浜�")
+    @ColumnWidth(10)
     private String header;
 
     @Schema(title = "鑱旂郴鐢佃瘽")
+    @ExcelProperty("鑱旂郴鐢佃瘽")
+    @ColumnWidth(15)
     private String phone;
 
     @Schema(title = "褰掑睘鍦�")
+    @ExcelProperty("褰掑睘鍦�")
+    @ColumnWidth(25)
     private String address;
 
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Schema(title = "鎿嶄綔鏃堕棿")
+    @ExcelIgnore
     private Date operateDt;
 }

--
Gitblit v1.8.0