Merge remote-tracking branch 'origin/master'

xiebin

2022-08-04 b7b04173afd9a05cedda9f44c53e52847806fb51

 src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.java

@@ -38,5 +38,7 @@
    * @return
    */
   List<StockfactoryVO> selectStockfactoryPage(IPage page, StockfactoryVO stockfactory);

   List<StockfactoryVO> selectStockfactoryPages( StockfactoryVO stockfactory);
   List selectStockFa();
   List selectStockIn(String name);
}