From 4fa212add5bb7689331e9e070c802bfcb5dcafa2 Mon Sep 17 00:00:00 2001 From: rain <1679827795@qq.com> Date: Mon, 02 Feb 2026 17:21:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceTrackService.java | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceTrackService.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceTrackService.java index 8f1cf81..c37c482 100644 --- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceTrackService.java +++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceTrackService.java @@ -17,6 +17,7 @@ package org.sxkj.fw.device.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.sxkj.fw.device.dto.FwDeviceTrackDTO; import org.sxkj.fw.device.entity.FwDeviceTrackEntity; import org.sxkj.fw.device.vo.FwDeviceTrackVO; import org.sxkj.fw.device.excel.FwDeviceTrackExcel; @@ -38,7 +39,7 @@ * @param fwDeviceTrack * @return */ - IPage<FwDeviceTrackVO> selectFwDeviceTrackPage(IPage<FwDeviceTrackVO> page, FwDeviceTrackVO fwDeviceTrack); + IPage<FwDeviceTrackEntity> selectFwDeviceTrackPage(IPage<FwDeviceTrackEntity> page, FwDeviceTrackDTO fwDeviceTrack); /** @@ -49,4 +50,10 @@ */ List<FwDeviceTrackExcel> exportFwDeviceTrack(Wrapper<FwDeviceTrackEntity> queryWrapper); + /** + * + * @param fwDeviceTrackEntity + * @return + */ + boolean saveOrUpdateFwDeviceTrack(FwDeviceTrackEntity fwDeviceTrackEntity); } -- Gitblit v1.9.3