Merge remote-tracking branch 'origin/master'

linwei

2026-02-02 1bfbc52da47b22f00a1c1f5f670c30f70d999873

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

@@ -55,7 +55,9 @@
    */
   List<FwAreaDivideVO> selectFwAreaDivideList(@Param("filterSelected") Integer filterSelected,
      @Param("sceneId") Long sceneId,
      @Param("areaTypeKeyList") List<String> areaTypeKeyList);
      @Param("areaTypeKeyList") List<String> areaTypeKeyList,
      @Param("isSetSceneManage") Integer isSetSceneManage,
      @Param("flyTime") java.time.LocalDateTime flyTime);

   /**
    * 根据设备ID获取区域