From 939a99e2b94ca9dc96cf88b1ec403fc357f50e8a Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 21 Jan 2026 15:37:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.java
index 1802e21..b6e4d51 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.java
@@ -17,6 +17,7 @@
 package org.sxkj.gd.orderdata.mapper;
 
 import org.sxkj.gd.orderdata.entity.GdDataObjectionEntity;
+import org.sxkj.gd.orderdata.param.GdDataObjectionPageParam;
 import org.sxkj.gd.orderdata.vo.GdDataObjectionVO;
 import org.sxkj.gd.orderdata.excel.GdDataObjectionExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -40,7 +41,7 @@
 	 * @param gdDataObjection
 	 * @return
 	 */
-	List<GdDataObjectionVO> selectGdDataObjectionPage(IPage page, GdDataObjectionVO gdDataObjection);
+	List<GdDataObjectionVO> selectGdDataObjectionPage(IPage page, GdDataObjectionPageParam gdDataObjection);
 
 
 	/**

--
Gitblit v1.9.3