Merge branch 'div_12'

yujian

2019-05-14 ad9fbd2c18f280ef9bba47f28353d367cf2d94e8

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

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

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

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

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