Merge remote-tracking branch 'origin/master'

xiebin

2022-08-04 b7b04173afd9a05cedda9f44c53e52847806fb51

 src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java

@@ -120,7 +120,7 @@
   }

   @Override
   public List<Land> selectByStrainId(String strainId) {
      return baseMapper.selectByStrainId(strainId);
   public List<Land> selectByStrainId(String strainId,String farmId) {
      return baseMapper.selectByStrainId(strainId,farmId);
   }
}