Merge remote-tracking branch 'origin/master'

xiebin

2022-08-04 b7b04173afd9a05cedda9f44c53e52847806fb51

 src/main/java/org/springblade/modules/lang/service/ILandService.java

@@ -92,4 +92,12 @@
    * @return
    */
    List<Integer> getLandIsAreaStatistic(LandVO land);

   /**
    * 根据品种id查询地块
    * @param strainId 品种id
    * @param farmId 农场id
    * @return
    */
   List<Land> selectByStrainId(String strainId,String farmId);
}