From d72d88f9e19ead4bbc2f69c4f5fbe66b1edbdc31 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 10 十月 2025 18:16:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysEducationalInfoMapper.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysEducationalInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysEducationalInfoMapper.java
index d246d38..8a80deb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysEducationalInfoMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysEducationalInfoMapper.java
@@ -4,6 +4,7 @@
 import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.model.TSysEducationalInfo;
 import com.ruoyi.system.query.TSysEducationalInfoQuery;
+import com.ruoyi.system.vo.TSysEducationalInfoVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -24,5 +25,12 @@
      * @param pageInfo
      * @return
      */
-    List<TSysEducationalInfo> pageList(@Param("query") TSysEducationalInfoQuery query, @Param("pageInfo")PageInfo<TSysEducationalInfo> pageInfo);
+    List<TSysEducationalInfoVO> pageList(@Param("query") TSysEducationalInfoQuery query, @Param("pageInfo")PageInfo<TSysEducationalInfoVO> pageInfo);
+    /**
+     * 获取教育资讯分页列表
+     * @param query
+     * @param pageInfo
+     * @return
+     */
+    List<TSysEducationalInfo> pageListApp(@Param("query") TSysEducationalInfoQuery query, @Param("pageInfo")PageInfo<TSysEducationalInfo> pageInfo);
 }

--
Gitblit v1.7.1