Merge remote-tracking branch 'origin/master'

zengh

2022-08-01 daa6dce26ec80c58a0013b73c44a409a96f4cfc7

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

@@ -53,7 +53,7 @@
    */
   List<FarmPlantVO> getFarmPlantStatisticsCount(@Param("farmPlant") FarmPlantVO farm);

   int selectCount();
   int selectCount(@Param("farmPlant") FarmPlantVO farm);

   Map selectPlant(String code, String time);