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/waterrecord/service/WaterRecordService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/waterrecord/service/WaterRecordService.java b/src/main/java/com/ruoyi/waterrecord/service/WaterRecordService.java
index 775fb25..879610c 100644
--- a/src/main/java/com/ruoyi/waterrecord/service/WaterRecordService.java
+++ b/src/main/java/com/ruoyi/waterrecord/service/WaterRecordService.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.waterrecord.pojo.WaterRecord;
import org.springframework.web.multipart.MultipartFile;
@@ -21,5 +21,5 @@
*/
IPage<WaterRecord> listPage(Page page, WaterRecord waterRecord);
- AjaxResult importData(MultipartFile file);
+ R<?> importData(MultipartFile file);
}
--
Gitblit v1.9.3