From 78fcc1c15ea5b362404396b457d87b8a301acff1 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 21 Jan 2026 09:11:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 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 dfd332a..e6baac2 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
@@ -39,6 +39,12 @@
 	private	Long id;
 
 	/**
+	 * 设备sn
+	 */
+	@ApiModelProperty(value = "设备sn")
+	private String deviceSn;
+
+	/**
 	 * 设备名称
 	 */
 	@ApiModelProperty(value = "设备名称", required = true)
@@ -112,4 +118,10 @@
 	@ApiModelProperty(value = "设备状态，多个状态用逗号隔开")
 	private List<String> deviceStatusList;
 
+	/**
+	 * 运行状态（0:在线/1:离线/2:故障/3:报废）
+	 */
+	@ApiModelProperty(value = "运行状态（0:在线/1:离线/2:故障/3:报废）")
+	private Integer status;
+
 }

--
Gitblit v1.9.3