Merge remote-tracking branch 'origin/master'

yaowanxin

昨天 e2aa651db9f17d58819329de571037edc0f9eba2

 src/main/java/com/ruoyi/device/controller/DeviceRepairController.java

@@ -15,6 +15,7 @@

import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;

@Api(tags = "设备报修管理")
@RequestMapping("/device/reppair")
@@ -32,7 +33,7 @@

    @PostMapping()
    @ApiModelProperty("添加设备报修")
    public AjaxResult add(DeviceRepair deviceRepair) {
    public AjaxResult add( @RequestBody DeviceRepair deviceRepair) {
        return deviceRepairService.saveDeviceRepair(deviceRepair);
    }

@@ -44,14 +45,14 @@

    @PutMapping ()
    @ApiModelProperty("修改设备报修")
    public AjaxResult update(DeviceRepair deviceRepair) {
    public AjaxResult update( @RequestBody DeviceRepair deviceRepair) {
        return deviceRepairService.updateDeviceRepair(deviceRepair);
    }

    @DeleteMapping("/{id}")
    @DeleteMapping("/{ids}")
    @ApiModelProperty("删除设备报修")
    public AjaxResult delete(@PathVariable ArrayList<Long> ids) {
        boolean b = deviceRepairService.removeBatchByIds(ids);
    public AjaxResult delete(@PathVariable("ids") Long[] ids) {
        boolean b = deviceRepairService.removeBatchByIds(Arrays.asList(ids));
        if (!b) {
            return AjaxResult.error("删除失败");
        }