Merge remote-tracking branch 'origin/master'

tangzy

2022-07-18 6d7633051dc592f80b7967e34fa6e34f340f899d

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