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/mapper/GdManageDeviceMapper.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.java
index 1cc774a..a3fa9e8 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.java
@@ -17,6 +17,7 @@
 package org.sxkj.gd.workorder.mapper;
 
 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.mapper.BaseMapper;
@@ -40,7 +41,7 @@
 	 * @param gdManageDevice
 	 * @return
 	 */
-	List<GdManageDeviceVO> selectGdManageDevicePage(IPage page, GdManageDeviceVO gdManageDevice);
+	List<GdManageDeviceVO> selectGdManageDevicePage(IPage page, GdManageDevicePageParam gdManageDevice);
 
 
 	/**
@@ -56,5 +57,5 @@
 	 * @param gdManageDevice
 	 * @return
 	 */
-    List<GdManageDeviceVO> selectGdManageDevice(GdManageDeviceVO gdManageDevice);
+    List<GdManageDeviceVO> selectGdManageDevice(GdManageDevicePageParam gdManageDevice);
 }

--
Gitblit v1.9.3