Merge remote-tracking branch 'origin/master'

xiebin

2026-01-22 12cb0f2f79f216864b8f68b63309f409db68e02f

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/excel/FwDefenseSceneExcel.java

@@ -95,12 +95,6 @@
   @ExcelProperty("关联区域ID，逗号分隔")
   private String areaDivideIds;
   /**
    * 关联设备ID，逗号分隔
    */
   @ColumnWidth(20)
   @ExcelProperty("关联设备ID，逗号分隔")
   private String deviceIds;
   /**
    * 区域编码
    */
   @ColumnWidth(20)