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/ZInfoUserService.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java index 67ef1bc..e561557 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java +++ b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java @@ -22,8 +22,11 @@ AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize); + AjaxResult getInfoByfid(Long fid); List<ZInfoUser> selectByCondition(ZInfoUser zInfoUser); + AjaxResult removeByUserName(List<String> userName); + List<ZInfoUser> selectByFamId(long fid); AjaxResult searchMyRelation(); AjaxResult addRelation(ZfRelation zfRelation); @@ -39,7 +42,7 @@ AjaxResult addParent(Long fatherId, Long motherId); AjaxResult listAllExceptAdmin(); - + AjaxResult listAllFamilyPeople(); AjaxResult listMySelfAndSpouse(Long id); AjaxResult listGenealogy(Genealogy genealogy,Integer pageNum,Integer pageSize); -- Gitblit v1.9.1