From af6ffc009f92628023d183ffd4971e7e60084ecd Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 20 五月 2026 17:53:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/officesupplies/service/OfficeSuppliesService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/officesupplies/service/OfficeSuppliesService.java b/src/main/java/com/ruoyi/officesupplies/service/OfficeSuppliesService.java
index 3a521b5..4f6f9ce 100644
--- a/src/main/java/com/ruoyi/officesupplies/service/OfficeSuppliesService.java
+++ b/src/main/java/com/ruoyi/officesupplies/service/OfficeSuppliesService.java
@@ -2,7 +2,7 @@
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.officesupplies.pojo.OfficeSupplies;
/**
@@ -18,5 +18,5 @@
* @param officeSupplies
* @return
*/
- AjaxResult listPage(Page page, OfficeSupplies officeSupplies);
+ R<?> listPage(Page page, OfficeSupplies officeSupplies);
}
--
Gitblit v1.9.3