Merge remote-tracking branch 'origin/master'

zengh

2022-08-01 daa6dce26ec80c58a0013b73c44a409a96f4cfc7

 src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java

@@ -138,8 +138,8 @@
   }

   @Override
   public int selectCount() {
      return baseMapper.selectCount();
   public int selectCount(FarmPlantVO farm) {
      return baseMapper.selectCount(farm);
   }

   @Override