From b93a030e667a48e00926d121ff9eb029de72f857 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 06 八月 2024 19:36:23 +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/ZInfoUserService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 d12a5fc..3b2e60e 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
@@ -22,15 +22,20 @@
AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize);
+ Boolean findByuid(Long uid, Long tfid);
+ List<ZInfoUser> selectByClanId(Integer clanId);
- public ZInfoUser getInfoBysysId(Long sysid);
+ List<ZInfoUser> getDataBySex(Integer sex);
+
+ public ZInfoUser getInfoBysysId(Long sysid);
+
AjaxResult getInfoByfid(Long fid);
// AjaxResult updateBySysId()
List<ZInfoUser> selectByCondition(ZInfoUser zInfoUser);
- AjaxResult removeByUserName(List userName);
+ AjaxResult removeByUserName(List<String> userName);
List<ZInfoUser> selectByFamId(long fid);
AjaxResult searchMyRelation();
@@ -47,7 +52,9 @@
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