From bbc3d8a4b43256e6cafefc7ab33f34e1459aed9b Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 09 Jan 2026 15:02:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java |    7 +++++++
 1 files changed, 7 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 8024b8a..80cb8fa 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
@@ -20,6 +20,7 @@
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 设备表 数据传输对象实体类
@@ -91,4 +92,10 @@
 	@ApiModelProperty(value = "联系电话")
 	private String contactPhone;
 
+	/**
+	 * 设备状态，多个状态用逗号隔
+	 */
+	@ApiModelProperty(value = "设备状态，多个状态用逗号隔开")
+	private List<String> deviceStatusList;
+
 }

--
Gitblit v1.9.3