Merge remote-tracking branch 'origin/master'

guoshilong

2022-07-28 7425196960cc7ecda7d2a09100e0c6456309ff64

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

}