From 769724ab08ba5695aff1a64ea8f48c9b1a4bd5da Mon Sep 17 00:00:00 2001 From: rain <1679827795@qq.com> Date: Fri, 23 Jan 2026 10:24:30 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdManageDeviceService.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdManageDeviceService.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdManageDeviceService.java index 4f3e4f2..24cbe81 100644 --- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdManageDeviceService.java +++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdManageDeviceService.java @@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.sxkj.gd.workorder.entity.GdManageDeviceEntity; +import org.sxkj.gd.workorder.param.GdManageDevicePageParam; import org.sxkj.gd.workorder.vo.GdManageDeviceVO; import org.sxkj.gd.workorder.excel.GdManageDeviceExcel; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -38,7 +39,7 @@ * @param gdManageDevice * @return */ - IPage<GdManageDeviceVO> selectGdManageDevicePage(IPage<GdManageDeviceVO> page, GdManageDeviceVO gdManageDevice); + IPage<GdManageDeviceVO> selectGdManageDevicePage(IPage<GdManageDeviceVO> page, GdManageDevicePageParam gdManageDevice); /** @@ -54,7 +55,7 @@ * @param gdManageDevice * @return */ - List<GdManageDeviceVO> selectGdManageDevice(GdManageDeviceVO gdManageDevice); + List<GdManageDeviceVO> selectGdManageDevice(GdManageDevicePageParam gdManageDevice); /** * 新增或修改 -- Gitblit v1.9.3