From bc1a6bb5bb2803ed6a5669a976bf2b47f3dacfca Mon Sep 17 00:00:00 2001 From: linwei <872216696@qq.com> Date: Wed, 14 Jan 2026 11:27:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwDefenseSceneService.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwDefenseSceneService.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwDefenseSceneService.java index 3bb76b0..db74b8d 100644 --- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwDefenseSceneService.java +++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwDefenseSceneService.java @@ -45,9 +45,10 @@ * * @param filterSelected * @param zoneId + * @param areaId * @return */ - List<FwDefenseSceneVO> selectFwDefenseSceneList(Integer filterSelected, Long zoneId); + List<FwDefenseSceneVO> selectFwDefenseSceneList(Integer filterSelected, Long zoneId, Long areaId); /** -- Gitblit v1.9.3