From faa2a5d8d3cba12ff98c261713bff4d9cea99b79 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 09 四月 2025 17:23:40 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java index c16a671..86ee120 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java @@ -17,6 +17,7 @@ import com.vincent.rsf.server.manager.service.WarehouseService; import com.vincent.rsf.server.system.controller.BaseController; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -166,12 +167,11 @@ ExcelUtil.build(ExcelUtil.create(list, Warehouse.class), response); } + @ApiOperation("鑾峰彇浠撳簱鏍戠姸鍥�") @PreAuthorize("hasAuthority('manager:warehouse:list')") - @GetMapping("/warehouse/areas") - public R getAreasForWarehouse() { - return R.ok(warehouseService.getAllWarehouseAreas()); + @PostMapping("/warehouse/areas") + public R getAreasForWarehouse(@RequestBody Map<String, Object> param) { + return R.ok(warehouseService.getAllWarehouseAreas(param)); } - - } -- Gitblit v1.9.1