From acb7c4c272aa02c2ed24cde72db429defef9fb8f Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 27 七月 2023 13:54:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/StrategyMapper.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/StrategyMapper.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/StrategyMapper.java
index b757628..2fed6b6 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/StrategyMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/StrategyMapper.java
@@ -3,6 +3,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import com.vci.ubcs.system.entity.Strategy;
 
@@ -22,15 +23,15 @@
 	 * @param page 鍒嗛〉瀵硅薄
 	 * @return 瀵硅薄鍒楄〃
 	 */
-	List<Strategy> queryAllByPage(IPage page);
+	IPage<Strategy> queryAllByPage(IPage page);
 
 	/**
 	 * 缁熻鎬昏鏁�
 	 *
-	 * @param plSysStrategy 鏌ヨ鏉′欢
+	 * @param sysStrategy 鏌ヨ鏉′欢
 	 * @return 鎬昏鏁�
 	 */
-	long count(Strategy plSysStrategy);
+	long count(Strategy sysStrategy);
 
 	/**
 	 * 鏍规嵁鐢ㄦ埛鍚嶄互鍙婄鎴稩D鏌ヨ瀵嗙爜绛栫暐

--
Gitblit v1.9.3