Merge branch 'dev_1'

yujian

2019-05-14 236b8cd939e9c161d5410f530f9539df7ebba484

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/activity/RecommendActivityMapper.java

@@ -24,7 +24,7 @@

   List<RecommendActivity> getRecommendActivityList(@Param("start") long start, @Param("count") int count);

   long getRecommendActivityCount();
   long getRecommendActivityCount(@Param("title") String title);
   
   long getRecommendActivityEffectiveCount();