Merge remote-tracking branch 'origin/master'

xiebin

2026-01-17 2e0b7e66be6b6f48cee02c009d08ff991326addd

 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);


   /**