Merge remote-tracking branch 'origin/master'

linwei

2026-02-03 4a6c8a672dc22fe730c0d891eb42b31f2f06f713

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java

@@ -54,10 +54,11 @@
    *
    * @param isAreaSelect
    * @param areaId
    * @param areaIds
    * @return
    */
   List<FwDeviceEntity> selectFwDeviceList(@Param("isAreaSelect") Integer isAreaSelect, @Param("areaId") Long areaId,
                                 @Param("status") Integer status, @Param("isTrack") Integer isTrack);
                                 @Param("areaIds") List<Long> areaIds, @Param("status") Integer status, @Param("isTrack") Integer isTrack);

   /**
    * 根据多边形查询设备列表