Merge remote-tracking branch 'origin/master'

rain

2026-02-02 4fa212add5bb7689331e9e070c802bfcb5dcafa2

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

@@ -52,7 +52,7 @@
    * @param sceneId
    * @return
    */
   List<FwAreaDivideVO> selectFwAreaDivideList(Integer filterSelected, Long sceneId, String areaTypeKeys);
   List<FwAreaDivideVO> selectFwAreaDivideList(Integer filterSelected, Long sceneId, String areaTypeKeys, Integer isSetSceneManage, java.time.LocalDateTime flyTime);

   /**
    * 根据设备ID获取关联场景名称