From 3eb37463a952fb69d586769ca660886b956cb016 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 30 十二月 2025 12:24:40 +0800
Subject: [PATCH] 人物搜索 新加所有家族模块
---
zhang-content/src/main/java/com/ruoyi/domain/ZfCollection.java | 70 ++++++++++++++++++++++++++++++-----
1 files changed, 60 insertions(+), 10 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..561a0bf 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfCollection.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfCollection.java
@@ -12,10 +12,11 @@
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
+import java.util.List;
/**
* <p>
- *
+ *
* </p>
*
* @author ojq
@@ -31,13 +32,7 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- /**
- * 鑾峰緱鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍒涘缓鏃堕棿", dateFormat = "yyyy-MM-dd")
- private Date getTime;
-
+ private String fileName;
/**
* 绫诲埆
*/
@@ -88,8 +83,8 @@
/**
* 鎵�灞炲搴璱d
*/
- @Excel(name = "鎵�灞炲搴紪鍙�")
- private String familyId;
+ @Excel(name = "鎵�灞炲搴紪鍙�(瀵煎叆鏁版嵁鏃惰鍒犻櫎姝ゆ爮)")
+ private Long familyId;
/**
* 鏄惁鏄湰瀹跺涵鐨勬暟鎹�(0:涓嶆槸,1:鏄�)
@@ -97,5 +92,60 @@
@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;
+
+ /**
+ * 鍒嗕韩浜篿d
+ */
+ private Integer shareId;
+
+ /**
+ * 鍙備笌鑰�
+ */
+ private String companion;
+
+ /**
+ * 鍙備笌鑰呭垪琛�
+ */
+ @TableField(exist = false)
+ private List<String> companionList;
+
+// @TableField(exist = false)
+// private Integer year;
+
+ /**
+ * 鏄惁鏈夐檮浠�
+ */
+ @TableField(exist = false)
+ private String hasAttachment;
+
+
+ /**
+ * 鏄惁闅愯棌
+ */
+ private String isHide;
}
--
Gitblit v1.9.1