Merge remote-tracking branch 'origin/master'

Administrator

2022-07-09 ad589793b49fbf37b81a3f46f5c7142ea5346fab

 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();
}