Merge remote-tracking branch 'origin/master'

xiebin

2022-08-04 b7b04173afd9a05cedda9f44c53e52847806fb51

 src/main/java/org/springblade/modules/lang/mapper/LandMapper.java

@@ -94,5 +94,5 @@
    * @param strainId 品种id
    * @return
    */
   List<Land> selectByStrainId(String strainId);
   List<Land> selectByStrainId(@Param("strainId") String strainId,@Param("farmId") String farmId);
}