From 8e27235844b5640441d810e18e5adc863479735b Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期五, 19 五月 2023 21:41:22 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

---
 zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCollectionExcelBean.java |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 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..c06f6c4 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
@@ -19,13 +19,19 @@
     /**
      * 绫诲埆
      */
-    @Excel(name = "绫诲埆")
-    private String type;
+//    @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