Merge remote-tracking branch 'origin/master'

rain

2026-01-28 99227c34ea9967aacc087138795d1b99965b0345

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

@@ -81,8 +81,8 @@
   }

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