Merge remote-tracking branch 'origin/master'

xiebin

2022-08-04 b7b04173afd9a05cedda9f44c53e52847806fb51

 src/main/java/org/springblade/modules/stockfactory/service/IStockfactoryService.java

@@ -39,6 +39,7 @@
    * @return
    */
   IPage<StockfactoryVO> selectStockfactoryPage(IPage<StockfactoryVO> page, StockfactoryVO stockfactory);
   List<StockfactoryVO> selectStockfactoryPages(StockfactoryVO stockfactory);
   List selectStockFa();
   List selectStockIn();
   List selectStockIn(String name);
}