Merge remote-tracking branch 'origin/master'

aijinhui

2023-09-05 e42d5134188b4e93ebb0580ef60034976c987f0f

 ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java

@@ -209,8 +209,7 @@
        List<Long> deptList = sysDeptService.deptIdBySub(sysUser.getDeptId());
        ardAlarmpointsWellParam.setDeptList(deptList);
        //根据deptId获取对应兴趣点数据
        List<ArdAlarmpointsWell> list = ardAlarmpointsWellService.conditionList(ardAlarmpointsWellParam);
        return Results.succeed(list);
        return Results.succeed(ardAlarmpointsWellService.conditionList(ardAlarmpointsWellParam));
    }