Merge remote-tracking branch 'origin/master'

zengh

2022-08-01 daa6dce26ec80c58a0013b73c44a409a96f4cfc7

 src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java

@@ -149,8 +149,8 @@
    * @return
    */
   @GetMapping("/selectStockIn")
   public R selectStockIn() {
      return R.data(stockfactoryService.selectStockIn());
   public R selectStockIn(@RequestParam String name) {
      return R.data(stockfactoryService.selectStockIn(name));
   }