Merge remote-tracking branch 'origin/dev_New' into dev_New

zss

昨天 599b5ff692722226d1e30fbdffc594b826bfa815

 src/main/java/com/ruoyi/safe/controller/SafeHazardController.java

@@ -50,7 +50,7 @@
    @ApiOperation("删除危险源台账")
    @DeleteMapping("/{ids}")
    public R delSafeHazard(@RequestBody List<Integer> ids) {
        return R.ok(safeHazardService.removeBatchByIds(ids));
        return R.ok(safeHazardService.delSafeHazard(ids));
    }

}