Merge remote-tracking branch 'origin/master'

rain

2026-01-28 99227c34ea9967aacc087138795d1b99965b0345

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

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


   /**