From ba614fbd8836f9bcce04ab4177b06329bed0b651 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 18 七月 2024 15:10:39 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java index e44019b..57ae403 100644 --- a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java +++ b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java @@ -20,8 +20,8 @@ @Mapper public interface WorkOrderMapper extends BaseMapper<WorkOrder> { - void page(IPage page, @Param("query") WorkOrderQuery query); + IPage<WorkOrderVO> page(IPage page, @Param("query") WorkOrderQuery query); - List<WorkOrderVO> distributePage(@Param("query") DistributeWorkOrderQuery query); + IPage<WorkOrderVO> distributePage(IPage page, @Param("query") DistributeWorkOrderQuery query); } -- Gitblit v1.8.0