From 923af8f8eb0d849b92afa8b567036aae2837f202 Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期五, 21 四月 2023 16:41:00 +0800
Subject: [PATCH] 888

---
 zhang-content/src/main/java/com/ruoyi/domain/ZfCollection.java |   34 ++++++++++++++++++++++++++--------
 1 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfCollection.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfCollection.java
index 1ed6f7b..3a2530d 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfCollection.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfCollection.java
@@ -32,13 +32,6 @@
     private Integer id;
 
     /**
-     * 鑾峰緱鏃堕棿
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "鍒涘缓鏃堕棿", dateFormat = "yyyy-MM-dd")
-    private Date getTime;
-
-    /**
      * 绫诲埆
      */
     @Excel(name = "绫诲埆")
@@ -88,7 +81,7 @@
     /**
      * 鎵�灞炲搴璱d
      */
-    @Excel(name = "鎵�灞炲搴紪鍙�")
+    @Excel(name = "鎵�灞炲搴紪鍙�(瀵煎叆鏁版嵁鏃惰鍒犻櫎姝ゆ爮)")
     private String familyId;
 
     /**
@@ -97,5 +90,30 @@
     @TableField(exist = false)
     private Integer ownData = 0;
 
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    /**
+     * 寮�濮嬫椂闂�
+     */
+    @TableField(exist = false)
+    private Date happenStartTime;
+
+    /**
+     * 缁撴潫鏃堕棿
+     */
+    @TableField(exist = false)
+    private Date happenEndTime;
+
+    /**
+     * 鑾峰緱鏃堕棿
+     */
+    @Excel(name = "鍙戠敓鏃堕棿", dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date happenTime;
+
 
 }

--
Gitblit v1.9.1