From b10f260189e5db5b89d9a85ce4fb08984d2aae2a Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期三, 20 十一月 2024 10:59:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 zhang-content/src/main/java/com/ruoyi/service/ZfAncestorService.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfAncestorService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfAncestorService.java
index 8685cde..57cc54f 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfAncestorService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfAncestorService.java
@@ -4,9 +4,16 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.domain.ZfAncestor;
+import com.ruoyi.domain.dto.AncestorClan;
+
+import java.util.List;
 
 public interface ZfAncestorService extends IService<ZfAncestor> {
     AjaxResult selectDataList(Integer clanId, Integer pageNo, Integer pageSize);
+    AjaxResult selectDataList(ZfAncestor zfAncestor, Integer pageNo, Integer pageSize);
+    List<AncestorClan> selectByCondition(ZfAncestor zfAncestor);
+
+    List<AncestorClan> selectByIds(Long []ids);
 
     boolean count(Integer clanId);
 
@@ -18,4 +25,6 @@
 
     ZfAncestor update(ZfAncestor zfAncestor);
 
+    ZfAncestor selectZfAncestor(ZfAncestor zfAncestor);
+
 }

--
Gitblit v1.9.1