From 4fa212add5bb7689331e9e070c802bfcb5dcafa2 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 02 Feb 2026 17:21:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/entity/FwDefenseSceneEntity.java |   36 ------------------------------------
 1 files changed, 0 insertions(+), 36 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..af51913 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
@@ -49,36 +49,6 @@
 	@ApiModelProperty(value = "场景类型:核心区/学校等")
 	private String sceneType;
 	/**
-	 * 指挥点经度
-	 */
-	@TableField("longitude")
-	@ApiModelProperty(value = "指挥点经度")
-	private Double longitude;
-	/**
-	 * 指挥点纬度
-	 */
-	@TableField("latitude")
-	@ApiModelProperty(value = "指挥点纬度")
-	private Double latitude;
-	/**
-	 * 防控负责人
-	 */
-	@TableField("defense_leader")
-	@ApiModelProperty(value = "防控负责人")
-	private String defenseLeader;
-	/**
-	 * 防控负责人电话
-	 */
-	@TableField("leader_phone")
-	@ApiModelProperty(value = "防控负责人电话")
-	private String leaderPhone;
-	/**
-	 * 防控面积(m)
-	 */
-	@TableField("defense_area")
-	@ApiModelProperty(value = "防控面积(m)")
-	private Integer defenseArea;
-	/**
 	 * 设备模式
 	 */
 	@TableField("device_mode")
@@ -90,12 +60,6 @@
 	@TableField("area_divide_ids")
 	@ApiModelProperty(value = "关联区域ID,逗号分隔")
 	private String areaDivideIds;
-	/**
-	 * 关联设备ID,逗号分隔
-	 */
-	@TableField("device_ids")
-	@ApiModelProperty(value = "关联设备ID,逗号分隔")
-	private String deviceIds;
 	/**
 	 * 区域编码
 	 */

--
Gitblit v1.9.3