Merge remote-tracking branch 'origin/master'

xiebin

2022-08-04 b7b04173afd9a05cedda9f44c53e52847806fb51

 src/main/java/org/springblade/modules/stock/mapper/StockMapper.java

@@ -45,6 +45,7 @@
   List<StockVO> selectStockPage(IPage page, StockVO stock);

   List<StockVO> selectLists(IPage page, StockVO stock);
   List<StockVO> selectListss(StockVO stock);

   int UpdaeAmountc(@Param("stock") Stock stock);