From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/basic/controller/SupplierManageController.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
index cbd6eb4..f1a45d1 100644
--- a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
+++ b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
@@ -7,7 +7,6 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
@@ -30,9 +29,9 @@
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody SupplierManage supplierManage) {
+ public R add(@RequestBody SupplierManage supplierManage) {
supplierService.saveSupplier(supplierManage);
- return AjaxResult.success();
+ return R.ok();
}
/**
@@ -41,12 +40,12 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delSupplier(@RequestBody List<Integer> ids) {
+ public R delSupplier(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
supplierService.delSupplier(ids);
- return AjaxResult.success();
+ return R.ok();
}
/**
@@ -55,8 +54,8 @@
* @return
*/
@GetMapping("/{id}")
- public AjaxResult supplierDetail(@PathVariable("id") Integer id) {
- return AjaxResult.success(supplierService.supplierDetail(id));
+ public R supplierDetail(@PathVariable("id") Integer id) {
+ return R.ok(supplierService.supplierDetail(id));
}
/**
@@ -65,9 +64,9 @@
* @return
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody SupplierManage supplierManage) {
+ public R update(@RequestBody SupplierManage supplierManage) {
supplierService.supplierUpdate(supplierManage);
- return AjaxResult.success();
+ return R.ok();
}
/**
@@ -77,8 +76,8 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult supplierListPage(Page page, SupplierManageDto supplierManageDto) {
- return AjaxResult.success(supplierService.supplierListPage(page, supplierManageDto));
+ public R supplierListPage(Page page, SupplierManageDto supplierManageDto) {
+ return R.ok(supplierService.supplierListPage(page, supplierManageDto));
}
/**
@@ -113,7 +112,7 @@
* @return
*/
@GetMapping("/getOptions")
- public AjaxResult getOptions() {
- return AjaxResult.success(supplierService.list());
+ public R getOptions() {
+ return R.ok(supplierService.list());
}
}
--
Gitblit v1.9.3