Merge remote-tracking branch 'origin/master'

linwei

2026-01-19 1f9f5596657af4af7e4e7da735358a0f00d64bbc

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

@@ -49,11 +49,12 @@
   /**
    * 列表查询
    *
    * @param isAreaSelect
    * @param areaId
    * @param isAreaSelect 是否过滤区域
    * @param areaId 设备被关联区域id
    * @param status 设备状态
    * @return
    */
   List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId);
   List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId, Integer status);


   /**