Merge remote-tracking branch 'origin/master'

zengh

2022-08-01 daa6dce26ec80c58a0013b73c44a409a96f4cfc7

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

@@ -41,5 +41,5 @@
   IPage<StockfactoryVO> selectStockfactoryPage(IPage<StockfactoryVO> page, StockfactoryVO stockfactory);
   List<StockfactoryVO> selectStockfactoryPages(StockfactoryVO stockfactory);
   List selectStockFa();
   List selectStockIn();
   List selectStockIn(String name);
}