From 01a30369e55a754c28dec4939a99e59aefecdc60 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 08 八月 2024 20:48:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 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 b384837..7055348 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
@@ -1,8 +1,11 @@
 package com.ycl.platform.domain.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import lombok.Data;
+
+import java.util.Date;
 
 /**
  * 鐐逛綅瀵煎叆瀵煎嚭
@@ -29,4 +32,14 @@
     @ExcelProperty("褰撳墠杩愮淮鍗曚綅")
     private String unitName;
 
+    @ColumnWidth(16)
+    @DateTimeFormat("yyyy-MM-dd")
+    @ExcelProperty("杩愮淮寮�濮嬫椂闂�")
+    private Date startTime;
+
+    @ColumnWidth(16)
+    @DateTimeFormat("yyyy-MM-dd")
+    @ExcelProperty("杩愮淮缁撴潫鏃堕棿")
+    private Date endTime;
+
 }

--
Gitblit v1.8.0