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/FwDeviceDTO.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java
index a5dc2e0..8024b8a 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java
@@ -17,20 +17,23 @@
package org.sxkj.fw.device.dto;
import io.swagger.annotations.ApiModelProperty;
-import org.sxkj.fw.device.entity.FwDeviceEntity;
import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
/**
* 设备表 数据传输对象实体类
*
- * @author Aix
+ * @author aix
* @since 2026-01-08
*/
@Data
-public class FwDeviceDTO {
+public class FwDeviceDTO implements Serializable {
private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ private Long id;
/**
* 设备名称
@@ -68,9 +71,24 @@
@ApiModelProperty(value = "来源")
private String source;
/**
- * 备注
+ * 用途
*/
- @ApiModelProperty(value = "备注")
- private String remark;
+ @ApiModelProperty(value = "用途")
+ private String purpose;
+ /**
+ * 所属部门
+ */
+ @ApiModelProperty(value = "所属部门")
+ private Long belongDept;
+ /**
+ * 负责人
+ */
+ @ApiModelProperty(value = "负责人")
+ private String charger;
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty(value = "联系电话")
+ private String contactPhone;
}
--
Gitblit v1.9.3