Merge remote-tracking branch 'origin/master'

rain

2026-01-14 46b35a8bbb4767b2a28b03a88f705d18c9dbf426

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.java

@@ -46,10 +46,11 @@
    * 列表
    *
    * @param filterSelected
    * @param zoneId
    * @param areaId
    * @return
    */
   List<FwDefenseSceneVO> selectFwDefenseSceneList(@Param("filterSelected") Integer filterSelected, @Param("areaId") Long areaId);
   List<FwDefenseSceneVO> selectFwDefenseSceneList(@Param("filterSelected") Integer filterSelected, @Param("zoneId") Long zoneId, @Param("areaId") Long areaId);


   /**