From 70464cc66f77cf847464ffe71f2fd456ee11b0fb Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 08 Jan 2026 19:02:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceTrackMapper.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceTrackMapper.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceTrackMapper.java
index fd2dc1e..d1112e0 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceTrackMapper.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceTrackMapper.java
@@ -16,19 +16,20 @@
*/
package org.sxkj.fw.device.mapper;
-import org.sxkj.fw.device.entity.FwDeviceTrackEntity;
-import org.sxkj.fw.device.vo.FwDeviceTrackVO;
-import org.sxkj.fw.device.excel.FwDeviceTrackExcel;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
+import org.sxkj.fw.device.dto.FwDeviceTrackDTO;
+import org.sxkj.fw.device.entity.FwDeviceTrackEntity;
+import org.sxkj.fw.device.excel.FwDeviceTrackExcel;
+
import java.util.List;
/**
* 设备跟踪流转表 Mapper 接口
*
- * @author Aix
+ * @author aix
* @since 2026-01-08
*/
public interface FwDeviceTrackMapper extends BaseMapper<FwDeviceTrackEntity> {
@@ -40,7 +41,7 @@
* @param fwDeviceTrack
* @return
*/
- List<FwDeviceTrackVO> selectFwDeviceTrackPage(IPage page, FwDeviceTrackVO fwDeviceTrack);
+ List<FwDeviceTrackEntity> selectFwDeviceTrackPage(IPage page, FwDeviceTrackDTO fwDeviceTrack);
/**
--
Gitblit v1.9.3