From c389b1ca090df256bad7fd0d183914146c1f93b8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 12 四月 2019 12:15:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/activity/RecommendActivityMapper.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/activity/RecommendActivityMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/activity/RecommendActivityMapper.java
index a65925a..6746007 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/activity/RecommendActivityMapper.java
+++ b/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);

--
Gitblit v1.8.0