Merge remote-tracking branch 'origin/master' into master_develop

yujian

2019-05-05 b63c28a0c24782753eae26892171dd1a0c8d1fe7

 fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java

@@ -120,8 +120,8 @@
   }



   @Override

   public long getRecommendActivityCount() {

      return recommendActivityMapper.getRecommendActivityCount();

   public long getRecommendActivityCount(String title) {

      return recommendActivityMapper.getRecommendActivityCount(title);

   }



   @Override