From 5533880a277aa5dd75c1794f7f5fa4426ea41d6e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 14 十一月 2024 23:54:08 +0800
Subject: [PATCH] 白名单故障类型

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java
index be898c3..9189529 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java
@@ -4,10 +4,11 @@
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.ycl.platform.domain.vo.DynamicColumnVO;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 鐐逛綅瀵煎叆瀵煎嚭
@@ -17,10 +18,9 @@
  */
 @Data
 public class PointExport {
-
+    private Integer id;
     @ColumnWidth(50)
     @ExcelProperty("鐐逛綅鍚嶇О(鍙慨鏀�)")
-
     private String pointName;
 
     @ColumnWidth(30)
@@ -30,6 +30,9 @@
     @ColumnWidth(30)
     @ExcelProperty("鐐逛綅IP(鍙慨鏀�)")
     private String pointIP;
+    @ColumnWidth(30)
+    @ExcelProperty("鍖哄幙(涓嶅彲淇敼)")
+    private String area;
 
     @ColumnWidth(40)
     @ExcelProperty("褰撳墠杩愮淮鍗曚綅(瀵煎叆鐣岄潰鍙敼)")
@@ -58,16 +61,18 @@
 
     @ColumnWidth(20)
     @ExcelProperty("鏄惁閮ㄧ骇鏍囩(鍙慨鏀�)")
-    private String deptTag;
+    private String deptTagString;
 
+    @ExcelIgnore
+    private Boolean deptTag;
     @ExcelIgnore
     private Boolean importantTag;
 
-//    @ExcelProperty("鏄惁閲嶇偣鐐逛綅")
-//    private String importantTagString;
+    @ExcelProperty("鏄惁閲嶇偣鐐逛綅")
+    private String importantTagString;
 
     @ExcelIgnore
     private Boolean importantCommandImageTag;
 
-
+    private List<DynamicColumnVO> dynamicData;
 }

--
Gitblit v1.8.0