From f5ee8e7afb178179c1d1d078cf42fe33dc7607f9 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 20 五月 2026 16:02:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java b/src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java
index 82db913..6f0077f 100644
--- a/src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java
+++ b/src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java
@@ -5,19 +5,20 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.pojo.DeviceMaintenance;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.device.vo.DeviceMaintenanceVo;
+import com.ruoyi.framework.web.domain.R;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
public interface IDeviceMaintenanceService extends IService<DeviceMaintenance> {
IPage<DeviceMaintenanceDto> queryPage(Page page, DeviceMaintenanceDto deviceMaintenanceDto);
- AjaxResult saveDeviceRepair(DeviceMaintenance deviceMaintenance);
+ R<?> saveDeviceRepair(DeviceMaintenanceDto deviceMaintenance);
- AjaxResult updateDeviceDeviceMaintenance(DeviceMaintenance deviceMaintenance);
+ R<?> updateDeviceDeviceMaintenance(DeviceMaintenanceDto deviceMaintenance);
void export(HttpServletResponse response, Long[] ids);
- DeviceMaintenanceDto detailById(Long id);
+ DeviceMaintenanceVo detailById(Long id);
}
--
Gitblit v1.9.3