From 1496a2640408f000f31e01ebe90b5ef97237f5a1 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 19 八月 2025 19:42:46 +0800
Subject: [PATCH] 修改婚姻bug && 管理员修改用户信息时 同步修改用户姓名、性别、婚姻状态

---
 zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java |    9 +++++++--
 1 files changed, 7 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 967eadb..97b2a10 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,13 +19,17 @@
 @Service
 public interface ZfFamilyService extends IService<ZfFamily> {
 
-    ZfFamily getByNameAndUser(ZfFamily 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<ZfFamily> getByClanId(Long clanId);
+
     List<UserInfoDto> getByFamilyId(Long fid);
 
     List<UserInfoDto> getNowMember();

--
Gitblit v1.9.1