From 4a6c8a672dc22fe730c0d891eb42b31f2f06f713 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 03 Feb 2026 17:29:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java
index 9780064..1a893b5 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java
@@ -63,10 +63,11 @@
 	 *
 	 * @param isAreaSelect 是否过滤区域
 	 * @param areaId 设备被关联区域id
+	 * @param areaIds 设备被关联区域id集合
 	 * @param status 设备状态
 	 * @return
 	 */
-	List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId, Integer status, Integer isTrack);
+	List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId, List<Long> areaIds, Integer status, Integer isTrack);
 
 	/**
 	 * 根据多边形查询设备列表

--
Gitblit v1.9.3