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/stock/mapper/StockMapper.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/stock/mapper/StockMapper.java b/src/main/java/org/springblade/modules/stock/mapper/StockMapper.java
index 9803588..f0f12fa 100644
--- a/src/main/java/org/springblade/modules/stock/mapper/StockMapper.java
+++ b/src/main/java/org/springblade/modules/stock/mapper/StockMapper.java
@@ -52,7 +52,7 @@
 
 	List<StocksVO> slectNum(IPage page, StocksVO stock);
 
-	List<StocksVO> slectNumx(String startTime, String endTime);
+	List<StocksVO> slectNumx(String deptId,String startTime, String endTime);
 
-	List<Map<String, Object>> StockCount();
+	List<Map<String, Object>> StockCount(String deptId);
 }

--
Gitblit v1.9.3