From dc9c6c612cde7b938c6851383b9da99abab025a4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:02:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/device/service/MaintenanceTaskService.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/MaintenanceTaskService.java b/src/main/java/com/ruoyi/device/service/MaintenanceTaskService.java
index 19cb6ed..3364d0a 100644
--- a/src/main/java/com/ruoyi/device/service/MaintenanceTaskService.java
+++ b/src/main/java/com/ruoyi/device/service/MaintenanceTaskService.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.device.pojo.MaintenanceTask;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import java.util.List;
@@ -12,11 +12,11 @@
* @date : 2025/12/22 14:56
*/
public interface MaintenanceTaskService extends IService<MaintenanceTask> {
- AjaxResult listPage(Page page, MaintenanceTask maintenanceTask);
+ R<?> listPage(Page page, MaintenanceTask maintenanceTask);
- AjaxResult add(MaintenanceTask maintenanceTask);
+ R<?> add(MaintenanceTask maintenanceTask);
- AjaxResult updateByMaintenanceTaskId(MaintenanceTask maintenanceTask);
+ R<?> updateByMaintenanceTaskId(MaintenanceTask maintenanceTask);
- AjaxResult delete(List<Long> ids);
+ R<?> delete(List<Long> ids);
}
--
Gitblit v1.9.3