Merge remote-tracking branch 'origin/master'

guoshilong

2022-08-26 17cfbc75dc326f3e5963ee17c99d6516497f8cf1

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