Merge remote-tracking branch 'origin/master'

guoshilong

2022-08-31 584e6a7781c3c3e53a517a6ffd8e97dbf2f737ba

 src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.java

@@ -28,6 +28,7 @@
    */
   List<FarmPlantVO> selectFarmPlantPage(@Param("page") IPage page, @Param("farmPlant") FarmPlantVO farm);
   IPage<FarmPlantVO> selectFarmPlantPageCount(IPage<Object> page, FarmPlantVO farmPlant);
   IPage<FarmPlantVO> selectFarmPlantPageCountYM(IPage<Object> page, FarmPlantVO farmPlant);
   List<FarmPlantVO> getFarmPlantStatisticsCountz(@Param("page") IPage page, @Param("farmPlant") FarmPlantVO farm);

   /**