From 7070ffa6b493e75f79fe802dfc047ba3869d7b08 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 25 八月 2024 21:31:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/service/ZfFamilyService.java | 4 +++-
1 files changed, 3 insertions(+), 1 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..00a43e0 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,7 +19,8 @@
@Service
public interface ZfFamilyService extends IService<ZfFamily> {
- ZfFamily getByNameAndUser(ZfFamily zfFamily);
+ public AjaxResult selectDataList(ZfFamily zfFamily, Integer pageNum, Integer pageSize);
+ ZfFamily getByNameAndUser(ZfFamily zfFamily);
/**
* 鏍规嵁瀹跺涵鍚嶅瓧鏌ヨ瀹跺涵
*/
--
Gitblit v1.9.1