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

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwDefenseSceneManageVO.java |    5 +++++
 1 files changed, 5 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 9e91acb..a58e427 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
@@ -48,6 +48,11 @@
 	@ApiModelProperty(value = "关联场景配置ID")
 	private Long defenseSceneId;
 	/**
+	 * 场景配置名称
+	 */
+	@ApiModelProperty(value = "场景配置名称")
+	private String defenseSceneName;
+	/**
 	 * 场景名称
 	 */
 	@ApiModelProperty(value = "场景名称")

--
Gitblit v1.9.3