From 9d31915e99fcd5e5fc3b9453eb570fc2358e0179 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 14 一月 2025 16:48:30 +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 | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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..b0d755d 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java
@@ -4,6 +4,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfFamily;
+import com.ruoyi.domain.ZfProperty;
import com.ruoyi.domain.dto.UserInfoDto;
import org.springframework.stereotype.Service;
@@ -18,12 +19,14 @@
@Service
public interface ZfFamilyService extends IService<ZfFamily> {
+ public AjaxResult selectDataList(ZfFamily zfFamily, Integer pageNum, Integer pageSize);
+ ZfFamily getByNameAndUser(ZfFamily zfFamily);
/**
* 鏍规嵁瀹跺涵鍚嶅瓧鏌ヨ瀹跺涵
*/
- ZfFamily getByName(String familyName);
-
-
+ ZfFamily getByName(String familyName, Integer clanId);
+ ZfFamily getByFid(Long fid);
+ ZfFamily getByFamId(Long fid);
List<UserInfoDto> getByFamilyId(Long fid);
List<UserInfoDto> getNowMember();
@@ -31,4 +34,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