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/service/impl/FwDeviceTrackServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceTrackServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceTrackServiceImpl.java
index 1b6fb45..49a68e8 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceTrackServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceTrackServiceImpl.java
@@ -16,6 +16,7 @@
*/
package org.sxkj.fw.device.service.impl;
+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;
@@ -30,14 +31,14 @@
/**
* 设备跟踪流转表 服务实现类
*
- * @author Aix
+ * @author aix
* @since 2026-01-08
*/
@Service
public class FwDeviceTrackServiceImpl extends BaseServiceImpl<FwDeviceTrackMapper, FwDeviceTrackEntity> implements IFwDeviceTrackService {
@Override
- public IPage<FwDeviceTrackVO> selectFwDeviceTrackPage(IPage<FwDeviceTrackVO> page, FwDeviceTrackVO fwDeviceTrack) {
+ public IPage<FwDeviceTrackEntity> selectFwDeviceTrackPage(IPage<FwDeviceTrackEntity> page, FwDeviceTrackDTO fwDeviceTrack) {
return page.setRecords(baseMapper.selectFwDeviceTrackPage(page, fwDeviceTrack));
}
--
Gitblit v1.9.3