Merge remote-tracking branch 'origin/master'

tangzy

2022-07-18 6d7633051dc592f80b7967e34fa6e34f340f899d

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

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

   List<StockfactoryVO> selectStockfactoryPages( StockfactoryVO stockfactory);
   List selectStockFa();
   List selectStockIn();
}