From 05b430789fa8b375acc6e4d4abd98f89c430e3a7 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 23 九月 2025 10:05:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
index 0ab68c6..0876334 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
@@ -27,12 +27,17 @@
public class WarehouseController extends BaseController {
@Autowired
private WarehouseService warehouseService;
-
+ @GetMapping("/tree")
+ @ApiOperation("浠撳簱-鏌ヨ鏍�")
+ @Log(title = "浠撳簱-鏌ヨ鏍�", businessType = BusinessType.OTHER)
+ public AjaxResult listTree() {
+ return AjaxResult.success(warehouseService.findListTree());
+ }
@GetMapping("/list")
@ApiOperation("浠撳簱-鏌ヨ")
@Log(title = "浠撳簱-鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult list(@RequestBody Warehouse warehouse) {
- return AjaxResult.success(warehouseService.listPage( warehouse));
+ public AjaxResult list(Warehouse warehouse) {
+ return AjaxResult.success(warehouseService.findList(warehouse));
}
@PostMapping("/add")
@ApiOperation("浠撳簱-娣诲姞")
@@ -41,7 +46,7 @@
return AjaxResult.success(warehouseService.save(warehouse));
}
- @PostMapping("/update")
+ @PutMapping("/update")
@ApiOperation("浠撳簱-鏇存柊")
@Log(title = "浠撳簱-鏇存柊", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody Warehouse warehouse) {
--
Gitblit v1.9.3