Merge remote-tracking branch 'origin/master'

guoshilong

2022-07-28 7425196960cc7ecda7d2a09100e0c6456309ff64

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

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