From 98dce0b733be283767c17b62ce7ff312aacd9f5d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 24 六月 2026 13:25:48 +0800
Subject: [PATCH] 已领用并且被销售模块引用的公海客户不能回收或者编辑操作，已被销售模块引用的私海客户也不能编辑操作
---
src/main/java/com/ruoyi/officesupplies/service/impl/OfficeSuppliesServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/officesupplies/service/impl/OfficeSuppliesServiceImpl.java b/src/main/java/com/ruoyi/officesupplies/service/impl/OfficeSuppliesServiceImpl.java
index f366b6c..abdc1c7 100644
--- a/src/main/java/com/ruoyi/officesupplies/service/impl/OfficeSuppliesServiceImpl.java
+++ b/src/main/java/com/ruoyi/officesupplies/service/impl/OfficeSuppliesServiceImpl.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.impl.ServiceImpl;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.officesupplies.mapper.OfficeSuppliesMapper;
import com.ruoyi.officesupplies.pojo.OfficeSupplies;
import com.ruoyi.officesupplies.service.OfficeSuppliesService;
@@ -23,8 +23,8 @@
private final OfficeSuppliesMapper officeSuppliesMapper;
@Override
- public R<?> listPage(Page page, OfficeSupplies officeSupplies) {
+ public AjaxResult listPage(Page page, OfficeSupplies officeSupplies) {
IPage<OfficeSupplies> list = officeSuppliesMapper.listPage(page, officeSupplies);
- return R.ok(list);
+ return AjaxResult.success(list);
}
}
--
Gitblit v1.9.3