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/wrapper/FwDeviceTrackWrapper.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceTrackWrapper.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceTrackWrapper.java
index 82a8a8a..b8859c4 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceTrackWrapper.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/wrapper/FwDeviceTrackWrapper.java
@@ -21,12 +21,13 @@
import org.sxkj.fw.device.dto.FwDeviceTrackDTO;
import org.sxkj.fw.device.entity.FwDeviceTrackEntity;
import org.sxkj.fw.device.vo.FwDeviceTrackVO;
+
import java.util.Objects;
/**
* 设备跟踪流转表 包装类,返回视图层所需的字段
*
- * @author Aix
+ * @author aix
* @since 2026-01-08
*/
public class FwDeviceTrackWrapper extends BaseEntityWrapper<FwDeviceTrackEntity, FwDeviceTrackVO> {
@@ -40,8 +41,9 @@
return Objects.requireNonNull(BeanUtil.copy(fwDeviceTrack, FwDeviceTrackVO.class));
}
+ public FwDeviceTrackEntity entityDTO(FwDeviceTrackDTO fwDevice) {
+ return Objects.requireNonNull(BeanUtil.copy(fwDevice, FwDeviceTrackEntity.class));
+ }
- public FwDeviceTrackEntity entityDTO(FwDeviceTrackDTO fwDeviceTrackDTO) {
- return Objects.requireNonNull(BeanUtil.copy(fwDeviceTrackDTO, FwDeviceTrackEntity.class));
- }
+
}
--
Gitblit v1.9.3