Merge remote-tracking branch 'origin/master'

zengh

2022-07-01 e37630cbd344bd3e9b95964df31e7c23338c0924

 src/main/java/org/springblade/modules/farm/service/FarmService.java

@@ -36,4 +36,6 @@
    * @return
    */
   Farm getFarmInfo(FarmVO farm);
   Integer selectCountFarm();
   Integer selectCountUser();
}