From 05853ea02897a6242b01a16d6fa89da5fcfcd02a Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 22 五月 2026 09:10:53 +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/IDeviceMaintenanceService.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java b/src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java
index 6f0077f..e5a4080 100644
--- a/src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java
+++ b/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);
--
Gitblit v1.9.3