Merge remote-tracking branch 'origin/master'

linwei

2026-02-03 4a6c8a672dc22fe730c0d891eb42b31f2f06f713

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java

@@ -92,8 +92,8 @@
   }

   @Override
   public List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId, Integer status, Integer isTrack) {
      return baseMapper.selectFwDeviceList(isAreaSelect, areaId, status, isTrack);
   public List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId, List<Long> areaIds, Integer status, Integer isTrack) {
      return baseMapper.selectFwDeviceList(isAreaSelect, areaId, areaIds, status, isTrack);
   }

   @Override