From 9398b7743fa976b016dfbb2b9cf4a04db340508e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 09 十月 2025 11:56:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetWarehouseController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetWarehouseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetWarehouseController.java
index 071962b..2d258b7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetWarehouseController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetWarehouseController.java
@@ -7,12 +7,15 @@
import com.ruoyi.system.query.AssetWarehousePageQuery;
import com.ruoyi.system.service.AssetWarehouseService;
import com.ruoyi.system.vo.asset.AssetWarehouseVO;
+
+import java.util.List;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
@@ -66,5 +69,12 @@
return R.ok();
}
+ @ApiOperation("获取仓库列表(不分页)")
+ @GetMapping("/list")
+ public R<List<AssetWarehouseVO>> getList() {
+ List<AssetWarehouseVO> list = assetWarehouseService.getAllList();
+ return R.ok(list);
+ }
+
}
--
Gitblit v1.7.1