From f0792fca6d0874de97411af39c4d58d0c120412f Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期六, 09 十一月 2024 17:15:16 +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/ZfFamily.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java
index 0f0cdc2..90e9a4d 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java
@@ -35,10 +35,16 @@
/**
* 瀹跺涵鍚嶇О
*/
- @Excel(name="鐖朵翰id")
+// @Excel(name="鐖朵翰id")
private Long fid;
+// @Excel(name="姣嶄翰id")
+ private Long mid;
+
+
+
+ private Integer clanId;
}
--
Gitblit v1.9.1