Merge remote-tracking branch 'origin/master'

linwei

2026-01-23 a236d0df6640dbccb7d8b8f367944b393abed2d4

 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")