From 68af47f24bc344d2e1c5e1a848458b38679ddad4 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 06 十月 2025 08:39:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/ZfEconomy.java | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 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..0d26bba 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfEconomy.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfEconomy.java
@@ -31,17 +31,18 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+ private String fileName;
+
/**
* 0锛氬熀閲戙��1锛氬彴璐�
*/
- @Excel(name = "鏀舵敮绫诲瀷",readConverterExp = "0=鍩洪噾,1=鍙拌处")
- private Integer type;
+ @Excel(name = "鏀舵敮绫诲瀷")
+ private String type;
/**
* 鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍒涘缓鏃堕棿", dateFormat = "yyyy-MM-dd")
private Date createTime;
/**
@@ -65,8 +66,8 @@
/**
* 0:鐜伴噾,1:鑷姩鍒掓墸
*/
- @Excel(name = "鐜伴噾/鑷姩鍒掓墸",readConverterExp = "0=鐜伴噾,1=鑷姩鍒掓墸")
- private Integer kind;
+ @Excel(name = "鐜伴噾/鑷姩鍒掓墸")
+ private String kind;
/**
* 浣欓
@@ -82,8 +83,8 @@
private String url;
- @Excel(name = "鎵�灞炲搴紪鍙�")
- private String familyId;
+ @Excel(name = "鎵�灞炲搴紪鍙�(瀵煎叆鏁版嵁鏃惰鍒犻櫎姝ゆ爮)")
+ private Long familyId;
/**
* 鏄惁鏄湰瀹跺涵鐨勬暟鎹�(0:涓嶆槸,1:鏄�)
@@ -91,4 +92,30 @@
@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;
+
+ /**
+ * 鍒嗕韩浜篿d
+ */
+ private Integer shareId;
+
+ private String cosKey;
+
}
--
Gitblit v1.9.1