Merge remote-tracking branch 'origin/master'

zengh

2022-07-09 d48d6e9bb0bb48f8338798d8a2cba60396e16698

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

@@ -39,4 +39,5 @@
    */
   List<StockfactoryVO> selectStockfactoryPage(IPage page, StockfactoryVO stockfactory);
   List selectStockFa();
   List selectStockIn();
}