Merge branch 'dev_New_pro' into dev_pro_山西_晋和园

gongchunyi

2026-06-02 a8b712bc5b0af9ee6da25e1518729b78aa778fed

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