Merge remote-tracking branch 'origin/master'

admin

2019-04-22 36a6c7f1d1bc054a987aeabb4ab6d9f1278d8e4d

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

@@ -25,6 +25,8 @@
   List<RecommendActivity> getRecommendActivityList(@Param("start") long start, @Param("count") int count);

   long getRecommendActivityCount();
	
   long getRecommendActivityEffectiveCount();

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