From 6e2ffa951a5a08366e001a6bdec958eba9abcf99 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 19 Jan 2026 15:15:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 ab30638..c0841e8 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
@@ -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);
 
 
 	/**

--
Gitblit v1.9.3