Merge remote-tracking branch 'origin/master'

zengh

2022-07-09 d48d6e9bb0bb48f8338798d8a2cba60396e16698

 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);
   }