From df78e9074d62a146d68752d65a65baf8d6efa66f Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期一, 21 八月 2023 22:59:57 +0800
Subject: [PATCH] 652487
---
zhang-content/src/main/java/com/ruoyi/domain/ZfCollection.java | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 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..b4f7498 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,8 +81,8 @@
/**
* 鎵�灞炲搴璱d
*/
- @Excel(name = "鎵�灞炲搴紪鍙�")
- private String familyId;
+ @Excel(name = "鎵�灞炲搴紪鍙�(瀵煎叆鏁版嵁鏃惰鍒犻櫎姝ゆ爮)")
+ private Long familyId;
/**
* 鏄惁鏄湰瀹跺涵鐨勬暟鎹�(0:涓嶆槸,1:鏄�)
@@ -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