From 9d31915e99fcd5e5fc3b9453eb570fc2358e0179 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 14 一月 2025 16:48:30 +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