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

云

22 小时以前 3d556b8defe1ff5b9aeb481bd1d0a67b2ded0192

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

@@ -6,7 +6,7 @@
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.vo.DeviceMaintenanceVo;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.web.domain.AjaxResult;

import jakarta.servlet.http.HttpServletResponse;

@@ -14,9 +14,9 @@

    IPage<DeviceMaintenanceDto> queryPage(Page page, DeviceMaintenanceDto deviceMaintenanceDto);

    R<?> saveDeviceRepair(DeviceMaintenanceDto deviceMaintenance);
    AjaxResult saveDeviceRepair(DeviceMaintenanceDto deviceMaintenance);

    R<?> updateDeviceDeviceMaintenance(DeviceMaintenanceDto deviceMaintenance);
    AjaxResult updateDeviceDeviceMaintenance(DeviceMaintenanceDto deviceMaintenance);

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