Merge remote-tracking branch 'origin/master'

linwei

2026-01-14 bc1a6bb5bb2803ed6a5669a976bf2b47f3dacfca

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseSceneController.java

@@ -77,11 +77,12 @@
    */
   @GetMapping("/list")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "列表", notes = "传入filterSelected或zoneId")
   @ApiOperation(value = "列表", notes = "传入filterSelected或zoneId或areaId")
   public R<List<FwDefenseSceneVO>> list(
      @ApiParam(value = "是否过滤已被选择的数据（1过滤 0不过滤）") @RequestParam(required = false) Integer filterSelected,
      @ApiParam(value = "防区id") @RequestParam(required = false) Long zoneId) {
      List<FwDefenseSceneVO> list = fwDefenseSceneService.selectFwDefenseSceneList(filterSelected, zoneId);
      @ApiParam(value = "防区id") @RequestParam(required = false) Long zoneId,
      @ApiParam(value = "区域id") @RequestParam(required = false) Long areaId) {
      List<FwDefenseSceneVO> list = fwDefenseSceneService.selectFwDefenseSceneList(filterSelected, zoneId, areaId);
      return R.data(list);
   }