Merge remote-tracking branch 'origin/master'

linwei

2026-01-28 c04afebf9cebfd65bf55c2395e732f36f558d208

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

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


   /**
@@ -80,7 +81,7 @@
    * 设备出库去向统计
    * @return 统计数据
    */
   List<DeviceStatisticsVO> getDeviceOutStatistics();
   List<DeviceStatisticsVO> getDeviceOutStatistics(String effectiveRangeKmIsNotNull);

   /**
    * 设备生产厂商统计