From 7547cae4bed7d319f2cf1af4fa60c5d6c2c88f25 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 22 五月 2026 15:48:51 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/device/service/IDeviceRepairService.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java b/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java
index f6e112c..ae0b913 100644
--- a/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java
+++ b/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);
--
Gitblit v1.9.3