Merge remote-tracking branch 'origin/master'

zengh

2022-07-01 e37630cbd344bd3e9b95964df31e7c23338c0924

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

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

   List selectStockFa();
   List selectStockIn();
}