From 968ace59bdbb99d33caa16a88bc247afaa3b7c4c Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 31 三月 2026 11:00:02 +0800
Subject: [PATCH] Merge branch 'dev_长治_健齿齿科器材' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_长治_健齿齿科器材

---
 src/main/java/com/ruoyi/stock/controller/StockInventoryController.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
index f878bdb..5540404 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
@@ -105,4 +105,10 @@
     public R thawStock(@RequestBody StockInventoryDto stockInventoryDto) {
         return R.ok(stockInventoryService.thawStock(stockInventoryDto));
     }
+
+    @ApiOperation("鏌ヨ搴撳瓨鍘熸潗鏂�")
+    @GetMapping("/getMaterials")
+    public R getMaterials() {
+        return R.ok(stockInventoryService.getMaterials());
+    }
 }

--
Gitblit v1.9.3