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/dto/FwDeviceTrackDTO.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceTrackDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceTrackDTO.java
index ffb3a8b..93f7248 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceTrackDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceTrackDTO.java
@@ -21,25 +21,33 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.io.Serializable;
import java.util.Date;
/**
* 设备跟踪流转表 数据传输对象实体类
*
- * @author Aix
+ * @author aix
* @since 2026-01-08
*/
@Data
-public class FwDeviceTrackDTO {
+public class FwDeviceTrackDTO implements Serializable {
private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value = "主键")
+ private Long id;
+
+ /**
+ * 设备ID
+ */
+ @ApiModelProperty(value = "设备ID")
+ private Long deviceId;
/**
* 出库时间
*/
@ApiModelProperty(value = "出库时间")
private Date outTime;
-
/**
* 出库去向
*/
@@ -60,10 +68,5 @@
*/
@ApiModelProperty(value = "联系电话")
private String contactPhone;
- /**
- * 部门名称
- */
- @ApiModelProperty(value = "部门名称")
- private String deptName;
}
--
Gitblit v1.9.3