From ad589793b49fbf37b81a3f46f5c7142ea5346fab Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 09 Jul 2022 09:55:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/stock/service/impl/StockServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/stock/service/impl/StockServiceImpl.java b/src/main/java/org/springblade/modules/stock/service/impl/StockServiceImpl.java
index 213d94a..6ae363c 100644
--- a/src/main/java/org/springblade/modules/stock/service/impl/StockServiceImpl.java
+++ b/src/main/java/org/springblade/modules/stock/service/impl/StockServiceImpl.java
@@ -73,13 +73,13 @@
 	}
 
 	@Override
-	public List<StocksVO> slectNumx(String startTime, String endTime) {
-		return baseMapper.slectNumx(startTime,endTime);
+	public List<StocksVO> slectNumx(String deptId,String startTime, String endTime) {
+		return baseMapper.slectNumx(deptId,startTime,endTime);
 	}
 
 	@Override
-	public List<Map<String, Object>> StockCount() {
-		return baseMapper.StockCount();
+	public List<Map<String, Object>> StockCount(String deptId) {
+		return baseMapper.StockCount(deptId);
 	}
 
 

--
Gitblit v1.9.3