From bc1a6bb5bb2803ed6a5669a976bf2b47f3dacfca Mon Sep 17 00:00:00 2001 From: linwei <872216696@qq.com> Date: Wed, 14 Jan 2026 11:27:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/IFwDroneFlightRecordService.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/IFwDroneFlightRecordService.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/IFwDroneFlightRecordService.java index d096d58..72623e7 100644 --- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/IFwDroneFlightRecordService.java +++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/IFwDroneFlightRecordService.java @@ -17,6 +17,7 @@ package org.sxkj.fw.record.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.sxkj.fw.record.dto.FwDroneFlightRecordDTO; import org.sxkj.fw.record.entity.FwDroneFlightRecordEntity; import org.sxkj.fw.record.vo.FwDroneFlightRecordVO; import org.sxkj.fw.record.excel.FwDroneFlightRecordExcel; @@ -38,7 +39,7 @@ * @param fwDroneFlightRecord * @return */ - IPage<FwDroneFlightRecordVO> selectFwDroneFlightRecordPage(IPage<FwDroneFlightRecordVO> page, FwDroneFlightRecordVO fwDroneFlightRecord); + IPage<FwDroneFlightRecordVO> selectFwDroneFlightRecordPage(IPage<FwDroneFlightRecordVO> page, FwDroneFlightRecordDTO fwDroneFlightRecord); /** -- Gitblit v1.9.3