From faf55275dcb8d413f18642b3410c8e7df9f6cd9c Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 29 Jan 2026 10:09:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwDefenseSceneEntity.java |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwDefenseSceneEntity.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwDefenseSceneEntity.java
index 2ee09e4..660cab4 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwDefenseSceneEntity.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwDefenseSceneEntity.java
@@ -91,12 +91,6 @@
 	@ApiModelProperty(value = "关联区域ID,逗号分隔")
 	private String areaDivideIds;
 	/**
-	 * 关联设备ID,逗号分隔
-	 */
-	@TableField("device_ids")
-	@ApiModelProperty(value = "关联设备ID,逗号分隔")
-	private String deviceIds;
-	/**
 	 * 区域编码
 	 */
 	@TableField("area_code")

--
Gitblit v1.9.3