Merge branch 'dev_New_pro' into dev_平遥县盛达铸造厂

gongchunyi

2026-07-07 72a32c227fdf10f34fe563a7de35169da5729eea

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

@@ -6,7 +6,7 @@
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.vo.DeviceRepairVo;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.web.domain.AjaxResult;

import jakarta.servlet.http.HttpServletResponse;

@@ -15,13 +15,13 @@

    IPage<DeviceRepairVo> queryPage(Page page, DeviceRepairDto deviceRepairDto);

    R<?> saveDeviceRepair(DeviceRepairDto deviceRepairDto);
    AjaxResult saveDeviceRepair(DeviceRepairDto deviceRepairDto);

    R<?> updateDeviceRepair(DeviceRepairDto deviceRepairDto);
    AjaxResult updateDeviceRepair(DeviceRepairDto deviceRepairDto);

    R<?> confirmRepair(DeviceRepairDto deviceRepairDto);
    AjaxResult confirmRepair(DeviceRepairDto deviceRepairDto);

    R<?> approveRepairAcceptance(DeviceRepairDto deviceRepairDto);
    AjaxResult approveRepairAcceptance(DeviceRepairDto deviceRepairDto);

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