From 68af47f24bc344d2e1c5e1a848458b38679ddad4 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 06 十月 2025 08:39:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java | 5 ++++-
1 files changed, 4 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..97b2a10 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java
@@ -24,9 +24,12 @@
/**
* 鏍规嵁瀹跺涵鍚嶅瓧鏌ヨ瀹跺涵
*/
- ZfFamily getByName(String familyName);
+ ZfFamily getByName(String familyName, Integer clanId);
ZfFamily getByFid(Long fid);
ZfFamily getByFamId(Long fid);
+
+ List<ZfFamily> getByClanId(Long clanId);
+
List<UserInfoDto> getByFamilyId(Long fid);
List<UserInfoDto> getNowMember();
--
Gitblit v1.9.1