Merge remote-tracking branch 'origin/master'

xiebin

2022-08-04 b7b04173afd9a05cedda9f44c53e52847806fb51

 src/main/java/org/springblade/modules/lang/controller/LandController.java

@@ -111,8 +111,8 @@
    * 根据品种id查询对应地块
    */
   @GetMapping("/selcetByStrainId")
   public R selcetByStrainId(String strainId) {
      List<Land> list = landService.selectByStrainId(strainId);
   public R selcetByStrainId(String strainId,String farmId) {
      List<Land> list = landService.selectByStrainId(strainId,farmId);
      return R.data(list);
   }