From d93b232662d6d90f858996769a7d89ff0b4cf88c Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 14 一月 2025 16:48:08 +0800
Subject: [PATCH] 重新提交修改了个人记事本bug

---
 zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java |    6 ++++--
 1 files changed, 4 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..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,11 +19,12 @@
 @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<UserInfoDto> getByFamilyId(Long fid);

--
Gitblit v1.9.1