From 4d25380fe077f82b45f00e83ecb6d93e76c95554 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 29 八月 2024 16:27:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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 df9e471..0fac11f 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,6 +4,7 @@
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 lombok.Data;
import java.util.Date;
@@ -18,27 +19,28 @@
public class PointExport {
@ColumnWidth(50)
- @ExcelProperty("鐐逛綅鍚嶇О")
+ @ExcelProperty("鐐逛綅鍚嶇О(鍙慨鏀�)")
+
private String pointName;
@ColumnWidth(30)
- @ExcelProperty("鍥芥爣鐮�")
+ @ExcelProperty("鍥芥爣鐮�(涓嶅彲淇敼)")
private String serialNumber;
- @ColumnWidth(16)
- @ExcelProperty("鐐逛綅IP")
+ @ColumnWidth(30)
+ @ExcelProperty("鐐逛綅IP(鍙慨鏀�)")
private String pointIP;
@ColumnWidth(40)
- @ExcelProperty("褰撳墠杩愮淮鍗曚綅")
+ @ExcelProperty("褰撳墠杩愮淮鍗曚綅(瀵煎叆鐣岄潰鍙敼)")
private String unitName;
- @ColumnWidth(16)
+ @ColumnWidth(40)
@DateTimeFormat("yyyy-MM-dd")
@ExcelProperty("杩愮淮寮�濮嬫椂闂�")
private Date startTime;
- @ColumnWidth(16)
+ @ColumnWidth(40)
@DateTimeFormat("yyyy-MM-dd")
@ExcelProperty("杩愮淮缁撴潫鏃堕棿")
private Date endTime;
@@ -46,19 +48,20 @@
@ExcelIgnore
private Boolean provinceTag;
- @ExcelProperty("鏄惁鐪佸巺鏍囩")
+ @ColumnWidth(20)
+ @ExcelProperty("鏄惁鐪佸巺鏍囩(鍙慨鏀�)")
private String provinceTagString;
@ExcelIgnore
private Boolean importantTag;
- @ExcelProperty("鏄惁閲嶇偣鐐逛綅")
- private String importantTagString;
+// @ExcelProperty("鏄惁閲嶇偣鐐逛綅")
+// private String importantTagString;
@ExcelIgnore
private Boolean importantCommandImageTag;
- @ColumnWidth(16)
- @ExcelProperty("鏄惁閲嶇偣鎸囨尌鍥惧儚")
+ @ColumnWidth(20)
+ @ExcelProperty("鏄惁閲嶇偣鎸囨尌鍥惧儚(鍙慨鏀�)")
private String importantCommandImageTagString;
}
--
Gitblit v1.8.0