From 7b5bd819a97e0c9f361e0f71c5c75329770a9291 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 12 一月 2025 20:55:37 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

---
 zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java
index 00a43e0..b0d755d 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java
@@ -24,7 +24,7 @@
     /**
      * 鏍规嵁瀹跺涵鍚嶅瓧鏌ヨ瀹跺涵
      */
-    ZfFamily getByName(String familyName);
+    ZfFamily getByName(String familyName, Integer clanId);
     ZfFamily getByFid(Long fid);
     ZfFamily getByFamId(Long fid);
     List<UserInfoDto> getByFamilyId(Long fid);

--
Gitblit v1.9.1