Merge remote-tracking branch 'origin/master'

xiebin

2022-08-04 b7b04173afd9a05cedda9f44c53e52847806fb51

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

}