Merge branch 'dev_1'

yujian

2019-05-14 236b8cd939e9c161d5410f530f9539df7ebba484

 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