From 7425196960cc7ecda7d2a09100e0c6456309ff64 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 28 Jul 2022 11:33:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java b/src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java
index 90a3a7e..0ad70ec 100644
--- a/src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java
+++ b/src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java
@@ -149,8 +149,8 @@
* @return
*/
@GetMapping("/selectStockIn")
- public R selectStockIn() {
- return R.data(stockfactoryService.selectStockIn());
+ public R selectStockIn(@RequestParam String name) {
+ return R.data(stockfactoryService.selectStockIn(name));
}
--
Gitblit v1.9.3