From ae536b434f6eae2a64b4ce30cd8def726ff05a0a Mon Sep 17 00:00:00 2001 From: zqy <2522236926@qq.com> Date: 星期日, 22 六月 2025 22:47:02 +0800 Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend --- zhang-content/src/main/java/com/ruoyi/domain/ZfEvent.java | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 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 4285af2..7a52b97 100644 --- a/zhang-content/src/main/java/com/ruoyi/domain/ZfEvent.java +++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfEvent.java @@ -64,8 +64,14 @@ private String url; @Excel(name="鎵�灞炲搴紪鍙�(瀵煎叆鏁版嵁鏃惰鍒犻櫎姝ゆ爮)") - private String familyId; + private Long familyId; + + /** + * 鏄惁鏄湰瀹跺涵鐨勬暟鎹�(0:涓嶆槸,1:鏄�) + */ + @TableField(exist = false) + private Integer ownData = 0; /** * 寮�濮嬫椂闂� @@ -86,4 +92,9 @@ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date happenTime; + /** + * 鍒嗕韩浜篿d + */ + private Integer shareId; + } -- Gitblit v1.9.1