Merge remote-tracking branch 'origin/master'

rain

2026-01-19 6e2ffa951a5a08366e001a6bdec958eba9abcf99

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

@@ -53,8 +53,8 @@
   }

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