From d48d6e9bb0bb48f8338798d8a2cba60396e16698 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 09 Jul 2022 09:52:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 70d1ee0..f9b5b99 100644
--- a/src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java
+++ b/src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java
@@ -123,11 +123,23 @@
return R.status(stockfactoryService.deleteLogic(Func.toLongList(ids)));
}
-
+ /**
+ * 农资列表
+ * @return
+ */
@GetMapping("/selectStockFa")
public R selectStockFa() {
return R.data(stockfactoryService.selectStockFa());
}
+ /**
+ * 小程序农资列表
+ * @return
+ */
+ @GetMapping("/selectStockIn")
+ public R selectStockIn() {
+ return R.data(stockfactoryService.selectStockIn());
+ }
+
}
--
Gitblit v1.9.3