From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 18:18:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceTrackDTO.java |   56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 49 insertions(+), 7 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 93f7248..7d368dc 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
@@ -16,13 +16,13 @@
  */
 package org.sxkj.fw.device.dto;
 
-import io.swagger.annotations.ApiModelProperty;
-import org.sxkj.fw.device.entity.FwDeviceTrackEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
 import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 
 /**
  * 设备跟踪流转表 数据传输对象实体类
@@ -36,12 +36,14 @@
 	private static final long serialVersionUID = 1L;
 
 	@ApiModelProperty(value = "主键")
+	@JsonSerialize(using = ToStringSerializer.class)
 	private	Long id;
 
 	/**
 	 * 设备ID
 	 */
-	@ApiModelProperty(value = "设备ID")
+	@ApiModelProperty(value = "设备ID", required = true)
+	@NotNull
 	private Long deviceId;
 	/**
 	 * 出库时间
@@ -69,4 +71,44 @@
 	@ApiModelProperty(value = "联系电话")
 	private String contactPhone;
 
+
+
+
+
+
+	/**
+	 * 创建人
+	 */
+	@ApiModelProperty(value = "创建人")
+	private Long createUser;
+	/**
+	 * 创建部门
+	 */
+	@ApiModelProperty(value = "创建部门")
+	private Long createDept;
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 * 更新人
+	 */
+	@ApiModelProperty(value = "更新人")
+	private Long updateUser;
+	/**
+	 * 更新时间
+	 */
+	@ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+	/**
+	 * 状态（0正常 1停用）
+	 */
+	@ApiModelProperty(value = "状态（0正常 1停用）")
+	private Integer status;
+	/**
+	 * 删除标志（0存在 1删除）
+	 */
+	@ApiModelProperty(value = "删除标志（0存在 1删除）")
+	private Integer isDeleted;
 }

--
Gitblit v1.9.3