Merge remote-tracking branch 'origin/master'

zengh

2022-08-01 daa6dce26ec80c58a0013b73c44a409a96f4cfc7

 src/main/java/org/springblade/modules/stockfactory/service/impl/StockfactoryServiceImpl.java

@@ -51,8 +51,8 @@
   }

   @Override
   public List selectStockIn() {
      return baseMapper.selectStockIn();
   public List selectStockIn(String name) {
      return baseMapper.selectStockIn(name);
   }

}