From 5d7b0a0bbcae6844e2296ef53c3f4c88293dacfe Mon Sep 17 00:00:00 2001 From: jinquanOu <1511349576@qq.com> Date: 星期二, 11 六月 2024 18:18:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 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 d74a482..967eadb 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java +++ b/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java @@ -18,12 +18,13 @@ @Service public interface ZfFamilyService extends IService<ZfFamily> { + ZfFamily getByNameAndUser(ZfFamily zfFamily); /** * 鏍规嵁瀹跺涵鍚嶅瓧鏌ヨ瀹跺涵 */ ZfFamily getByName(String familyName); - - + ZfFamily getByFid(Long fid); + ZfFamily getByFamId(Long fid); List<UserInfoDto> getByFamilyId(Long fid); List<UserInfoDto> getNowMember(); @@ -31,4 +32,11 @@ AjaxResult addMember(UserInfoDto userInfoDto); AjaxResult removeMember(UserInfoDto userInfoDto); + + + AjaxResult addFamily(ZfFamily zfFamily); + + AjaxResult updateFam(ZfFamily zfFamily); + + AjaxResult deleteFam(Long []ids); } -- Gitblit v1.9.1