From c680e9ae370e75fbf90d54192d0f6cf2e8fc619a Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Thu, 22 Jan 2026 16:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdApplicationInnovationServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdApplicationInnovationServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdApplicationInnovationServiceImpl.java
index 0b64f54..7ff63c7 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdApplicationInnovationServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdApplicationInnovationServiceImpl.java
@@ -17,6 +17,7 @@
package org.sxkj.gd.orderdata.service.impl;
import org.sxkj.gd.orderdata.entity.GdApplicationInnovationEntity;
+import org.sxkj.gd.orderdata.param.GdApplicationInnovationPageParam;
import org.sxkj.gd.orderdata.vo.GdApplicationInnovationVO;
import org.sxkj.gd.orderdata.excel.GdApplicationInnovationExcel;
import org.sxkj.gd.orderdata.mapper.GdApplicationInnovationMapper;
@@ -37,7 +38,7 @@
public class GdApplicationInnovationServiceImpl extends BaseServiceImpl<GdApplicationInnovationMapper, GdApplicationInnovationEntity> implements IGdApplicationInnovationService {
@Override
- public IPage<GdApplicationInnovationVO> selectGdApplicationInnovationPage(IPage<GdApplicationInnovationVO> page, GdApplicationInnovationVO gdApplicationInnovation) {
+ public IPage<GdApplicationInnovationVO> selectGdApplicationInnovationPage(IPage<GdApplicationInnovationVO> page, GdApplicationInnovationPageParam gdApplicationInnovation) {
return page.setRecords(baseMapper.selectGdApplicationInnovationPage(page, gdApplicationInnovation));
}
--
Gitblit v1.9.3