Merge remote-tracking branch 'origin/master'

zengh

2022-07-01 e37630cbd344bd3e9b95964df31e7c23338c0924

 src/main/java/org/springblade/modules/stock/service/IStockService.java

@@ -46,4 +46,6 @@
   boolean UpdaeAmountc(Stock stock);
   boolean Updaet(Stock stock);
   IPage<StocksVO> slectNum(IPage<StocksVO> page, StocksVO stock);
   List<StocksVO> slectNumx(String deptId,String startTime, String endTime);
   List<Map<String, Object>> StockCount(String deptId);
}