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/warehouse/controller/WarehouseController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
index 7d80dd1..f8b6f96 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
@@ -4,7 +4,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.warehouse.pojo.Warehouse;
import com.ruoyi.warehouse.service.WarehouseService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -25,36 +25,36 @@
@GetMapping("/tree")
@Operation(summary = "浠撳簱-鏌ヨ鏍�")
@Log(title = "浠撳簱-鏌ヨ鏍�", businessType = BusinessType.OTHER)
- public AjaxResult listTree() {
- return AjaxResult.success(warehouseService.findListTree());
+ public R<?> listTree() {
+ return R.ok(warehouseService.findListTree());
}
@GetMapping("/list")
@Operation(summary = "浠撳簱-鏌ヨ")
@Log(title = "浠撳簱-鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult list(Warehouse warehouse) {
- return AjaxResult.success(warehouseService.findList(warehouse));
+ public R<?> list(Warehouse warehouse) {
+ return R.ok(warehouseService.findList(warehouse));
}
@PostMapping("/add")
@Operation(summary = "浠撳簱-娣诲姞")
@Log(title = "浠撳簱-娣诲姞", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody Warehouse warehouse) {
- return AjaxResult.success(warehouseService.save(warehouse));
+ public R<?> add(@RequestBody Warehouse warehouse) {
+ return R.ok(warehouseService.save(warehouse));
}
@PutMapping("/update")
@Operation(summary = "浠撳簱-鏇存柊")
@Log(title = "浠撳簱-鏇存柊", businessType = BusinessType.UPDATE)
- public AjaxResult update(@RequestBody Warehouse warehouse) {
- return AjaxResult.success(warehouseService.updateById(warehouse));
+ public R<?> update(@RequestBody Warehouse warehouse) {
+ return R.ok(warehouseService.updateById(warehouse));
}
@DeleteMapping("/delete")
@Operation(summary = "浠撳簱-鍒犻櫎")
@Log(title = "浠撳簱-鍒犻櫎", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
- if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(warehouseService.deleteByIds(ids));
+ public R<?> delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(warehouseService.deleteByIds(ids));
}
}
--
Gitblit v1.9.3