From e3e5d863f7da346e8beaed4fb6ed4a4fca0cb22b Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期五, 05 五月 2023 10:22:56 +0800
Subject: [PATCH] 111
---
zhang-content/src/main/java/com/ruoyi/domain/ZfEconomy.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfEconomy.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfEconomy.java
index 9683148..889ad2d 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfEconomy.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfEconomy.java
@@ -41,7 +41,6 @@
* 鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍒涘缓鏃堕棿", dateFormat = "yyyy-MM-dd")
private Date createTime;
/**
@@ -82,7 +81,7 @@
private String url;
- @Excel(name = "鎵�灞炲搴紪鍙�")
+ @Excel(name = "鎵�灞炲搴紪鍙�(瀵煎叆鏁版嵁鏃惰鍒犻櫎姝ゆ爮)")
private String familyId;
/**
@@ -91,4 +90,23 @@
@TableField(exist = false)
private Integer ownData = 0;
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @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