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/ZfProperty.java | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java
index 5cf7cad..3c3aeb7 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java
@@ -30,6 +30,9 @@
@TableId(type = IdType.AUTO)
private Integer id;
+ private String fileName;
+
+
/** 璧勪骇绫诲瀷 */
@Excel(name = "璧勪骇绫诲瀷")
private String type;
@@ -57,15 +60,47 @@
* 鍒涘缓鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍒涘缓鏃堕棿", dateFormat = "yyyy-MM-dd")
private Date createTime;
+
+ /**
+ * 鍙戠敓鏃堕棿
+ */
+ @Excel(name = "鏃堕棿", dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private Date happenTime;
private String url;
/**
* 瀹跺涵id
*/
- @Excel(name="瀹跺涵缂栧彿")
- private String familyId;
+ @Excel(name = "鎵�灞炲搴紪鍙�(瀵煎叆鏁版嵁鏃惰鍒犻櫎姝ゆ爮)")
+ private Long familyId;
+
+ /**
+ * 鏄惁鏄湰瀹跺涵鐨勬暟鎹�(0:涓嶆槸,1:鏄�)
+ */
+ @TableField(exist = false)
+ private Integer ownData = 0;
+
+ /**
+ * 鏁版嵁鐘舵��
+ */
+ @Excel(name = "鏄惁娉ㄩ攢",readConverterExp = "0=姝ｅ父,1=宸叉敞閿�")
+ private Integer status;
+
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @TableField(exist = false)
+ private Date happenStartTime;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @TableField(exist = false)
+ private Date happenEndTime;
+
+ private Integer shareId;
}
--
Gitblit v1.9.1