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

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseSceneManageVO.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseSceneManageVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseSceneManageVO.java
index a58e427..31c5b5c 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseSceneManageVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseSceneManageVO.java
@@ -53,6 +53,11 @@
 	@ApiModelProperty(value = "场景配置名称")
 	private String defenseSceneName;
 	/**
+	 * 场景类型：核心区/学校等
+	 */
+	@ApiModelProperty(value = "场景类型：核心区/学校等")
+	private String sceneType;
+	/**
 	 * 场景名称
 	 */
 	@ApiModelProperty(value = "场景名称")
@@ -92,5 +97,15 @@
 	 */
 	@ApiModelProperty(value = "区域编码")
 	private String areaCode;
+	/**
+	 * 区域数量
+	 */
+	@ApiModelProperty(value = "区域数量")
+	private Integer areaCount;
+	/**
+	 * 设备数量
+	 */
+	@ApiModelProperty(value = "设备数量")
+	private Integer deviceCount;
 
 }

--
Gitblit v1.9.3