From 8a71194e0cd81a39637bc9c5adbd8c9d1405f155 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 08 四月 2026 16:39:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

---
 src/main/java/com/ruoyi/approve/mapper/KnowledgeBaseMapper.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/approve/mapper/KnowledgeBaseMapper.java b/src/main/java/com/ruoyi/approve/mapper/KnowledgeBaseMapper.java
index adae509..b428d09 100644
--- a/src/main/java/com/ruoyi/approve/mapper/KnowledgeBaseMapper.java
+++ b/src/main/java/com/ruoyi/approve/mapper/KnowledgeBaseMapper.java
@@ -5,9 +5,10 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.approve.pojo.KnowledgeBase;
+import com.ruoyi.approve.vo.KnowledgeBaseVo;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface KnowledgeBaseMapper extends BaseMapper<KnowledgeBase> {
-    IPage<KnowledgeBase> listpage(Page page, KnowledgeBase knowledgeBase);
+    IPage<KnowledgeBaseVo> listpage(Page page, KnowledgeBase knowledgeBase);
 }

--
Gitblit v1.9.3