From 08553c034773008ba68b7b6709683b385610ee4f Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 28 五月 2026 09:52:38 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_New_pro_玉山机械
---
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 a0a9fa5..d6d72c0 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
@@ -147,4 +147,10 @@
public R getByModelId(Long productModelId) {
return R.ok(stockInventoryService.getByModelId(productModelId));
}
+
+ @PostMapping("/pageStockAndBorrow")
+ @Operation(summary = "鍒嗛〉鏌ヨ浜у搧搴撳瓨鍜岄鐢ㄩ噺")
+ public R pageStockAndBorrow(@RequestBody Page page, @RequestBody StockInventoryDto stockInventoryDto) {
+ return R.ok(stockInventoryService.pageStockAndBorrow(page, stockInventoryDto));
+ }
}
--
Gitblit v1.9.3