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

maven

昨天 d9ff3817f056ad245a16bd394133a407d6c6b9cf

 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);