Merge remote-tracking branch 'origin/master' into pim-qiao

青城

10 天以前 5c5fc86ebb905d5c0d09caef3d80f38b2aba6f18

 src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java

@@ -36,8 +36,8 @@
    }

    @Override
    public AjaxResult saveDeviceRepair(DeviceMaintenance deviceRepair) {
        boolean save = this.save(deviceRepair);
    public AjaxResult saveDeviceRepair(DeviceMaintenance deviceMaintenance) {
        boolean save = this.save(deviceMaintenance);
        if (save){
            return AjaxResult.success();
        }
@@ -45,8 +45,8 @@
    }

    @Override
    public AjaxResult updateDeviceRepair(DeviceMaintenance deviceRepair) {
        if (this.updateById(deviceRepair)) {
    public AjaxResult updateDeviceDeviceMaintenance(DeviceMaintenance deviceMaintenance) {
        if (this.updateById(deviceMaintenance)) {
            return AjaxResult.success();
        }
        return AjaxResult.error();