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

zss

昨天 6ed4b397bb9dbb9c2d7bb0676339721fa97996bf

 src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java

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

    AjaxResult saveDeviceRepair(DeviceMaintenance deviceMaintenance);

    AjaxResult updateDeviceRepair(DeviceMaintenance deviceMaintenance);
    AjaxResult updateDeviceDeviceMaintenance(DeviceMaintenance deviceMaintenance);

    void export(HttpServletResponse response, Long[] ids);