From 7070ffa6b493e75f79fe802dfc047ba3869d7b08 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 25 八月 2024 21:31:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/ZfContact.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfContact.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfContact.java
index c44af1c..a56bb56 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfContact.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfContact.java
@@ -31,9 +31,9 @@
private Long id;
/**
- * 鎴愬憳濮撳悕
+ * 瀹朵汉濮撳悕
*/
- @Excel(name = "鎴愬憳濮撳悕")
+ @Excel(name = "瀹朵汉濮撳悕")
private String myName;
/**
@@ -94,7 +94,7 @@
private String url;
@Excel(name="鎵�灞炲搴紪鍙�(瀵煎叆鏁版嵁鏃惰鍒犻櫎姝ゆ爮)")
- private String familyId;
+ private Long familyId;
/**
* 鍒涘缓鏃堕棿
@@ -127,5 +127,9 @@
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date happenTime;
+ /**
+ * 鍒嗕韩浜篿d
+ */
+ private Integer shareId;
}
--
Gitblit v1.9.1