Merge remote-tracking branch 'origin/master'

zengh

2022-07-01 e37630cbd344bd3e9b95964df31e7c23338c0924

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

@@ -132,5 +132,14 @@
      return R.data(stockfactoryService.selectStockFa());
   }

   /**
    * 小程序农资列表
    * @return
    */
   @GetMapping("/selectStockIn")
   public R selectStockIn() {
      return R.data(stockfactoryService.selectStockIn());
   }


}