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/ZfFamily.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 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 7c4175d..90e9a4d 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfFamily.java
@@ -27,5 +27,24 @@
     /**
      * 瀹跺涵鍚嶇О
      */
+    @Excel(name="瀹跺涵鍙�")
+
     private String name;
+
+
+    /**
+     * 瀹跺涵鍚嶇О
+     */
+//    @Excel(name="鐖朵翰id")
+
+    private Long fid;
+
+//    @Excel(name="姣嶄翰id")
+    private Long mid;
+
+
+
+    private Integer clanId;
+
+
 }

--
Gitblit v1.9.1