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

liyong

昨天 7558d3cb61282e41e27f85f56e829c6e6409f66d

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

@@ -65,7 +65,6 @@
    @PostMapping ("maintenance")
    @ApiModelProperty("修改设备保养")
    public AjaxResult maintenance(@RequestBody DeviceMaintenance deviceMaintenance) {
        deviceMaintenance.setStatus(1);
        return deviceMaintenanceService.updateDeviceDeviceMaintenance(deviceMaintenance);
    }