From b4895bdc5d9268e55c0023b92cc7c2d68ba33e46 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 05 十一月 2024 10:07:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCollectionExcelBean.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCollectionExcelBean.java b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCollectionExcelBean.java
index 94c8883..aa42319 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCollectionExcelBean.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCollectionExcelBean.java
@@ -21,11 +21,17 @@
*/
@Excel(name = "绫诲埆")
private String type;
+ /**
+ * 鑾峰緱鏃堕棿
+ */
+ @Excel(name = "鑾峰緱鏃堕棿", dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private Date happenTime;
/**
* 鍚嶅瓧
*/
- @Excel(name = "鍚嶅瓧")
+ @Excel(name = "鍚嶇О")
private String name;
/**
@@ -58,11 +64,5 @@
@Excel(name = "澶囨敞")
private String remark;
- /**
- * 鑾峰緱鏃堕棿
- */
- @Excel(name = "鍙戠敓鏃堕棿", dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
- private Date happenTime;
}
--
Gitblit v1.9.1