From 3bcd305ef9408ae54f7ef62b8472d0813ae34333 Mon Sep 17 00:00:00 2001 From: fujunling <2984387807@qq.com> Date: 星期五, 16 六月 2023 16:53:44 +0800 Subject: [PATCH] 解决冲突 --- Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/StrategyMapper.java | 3 ++- 1 files changed, 2 insertions(+), 1 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 dae9527..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,7 +23,7 @@ * @param page 鍒嗛〉瀵硅薄 * @return 瀵硅薄鍒楄〃 */ - List<Strategy> queryAllByPage(IPage page); + IPage<Strategy> queryAllByPage(IPage page); /** * 缁熻鎬昏鏁� -- Gitblit v1.9.3