From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/CockpitFwDeviceVO.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/CockpitFwDeviceVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/CockpitFwDeviceVO.java
index d429c91..b6d474a 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/CockpitFwDeviceVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/CockpitFwDeviceVO.java
@@ -41,6 +41,9 @@
 	@JsonSerialize(using = ToStringSerializer.class)
 	private	Long id;
 
+	@ApiModelProperty(value = "设备序列号")
+	private String deviceSn;
+
 	/**
 	 * 设备名称
 	 */
@@ -175,4 +178,11 @@
 	 */
 	@ApiModelProperty(value = "更新时间")
 	private Date updateTime;
+
+
+	@ApiModelProperty(value = "区域id")
+	private Long areaDivideId;
+
+	@ApiModelProperty(value = "场景管理id")
+	private Long defenseSceneManageId;
 }

--
Gitblit v1.9.3