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

gongchunyi

19 小时以前 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

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

@@ -40,15 +40,17 @@
    public R add(@RequestBody SafeHazard safeHazard) {
        return R.ok(safeHazardService.save(safeHazard));
    }

    @ApiOperation("修改危险源台账")
    @PutMapping ()
    public R update(@RequestBody  SafeHazard safeHazard) {
        return R.ok(safeHazardService.updateById(safeHazard));
    }

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

}