From e04b28bc07bf773938c3521bcfc96c70c29fa60f Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期五, 02 一月 2026 17:16:42 +0800
Subject: [PATCH] 修改bug

---
 zhang-content/src/main/java/com/ruoyi/domain/ZfEvent.java |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfEvent.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfEvent.java
index b2664d1..d4286cc 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfEvent.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfEvent.java
@@ -1,6 +1,7 @@
 package com.ruoyi.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -11,6 +12,7 @@
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -34,7 +36,6 @@
      * 鍒涘缓鏃堕棿
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "鍒涘缓鏃堕棿", dateFormat = "yyyy-MM-dd")
     private Date createTime;
 
     /**
@@ -42,6 +43,8 @@
      */
     @Excel(name="鍙備笌鏈澶т簨鐨勪汉鐗╁悕瀛�")
     private String people;
+
+    private String fileName;
 
     /**
      * 鍦扮偣
@@ -60,10 +63,58 @@
      */
     @Excel(name="澶囨敞淇℃伅")
     private String remark;
+    @Excel(name="鏄惁闅愯棌")
+    private String isHide;
+
+
 
     private String url;
 
-    @Excel(name="瀹跺涵缂栧彿")
-    private String familyId;
+    @Excel(name="鎵�灞炲搴紪鍙�(瀵煎叆鏁版嵁鏃惰鍒犻櫎姝ゆ爮)")
+    private Long familyId;
+
+
+    /**
+     * 鏄惁鏄湰瀹跺涵鐨勬暟鎹�(0:涓嶆槸,1:鏄�)
+     */
+    @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;
+
+    /**
+     * 鏄惁鏈夐檮浠�
+     */
+    @TableField(exist = false)
+    private String hasAttachment;
+
+
+    /**
+     * 鍙備笌鑰呭垪琛�
+     */
+    @TableField(exist = false)
+    private List<String> companionList;
 
 }

--
Gitblit v1.9.1