From b63c28a0c24782753eae26892171dd1a0c8d1fe7 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期日, 05 五月 2019 12:19:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master_develop

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/activity/RecommendActivityMapper.java |    4 +++-
 1 files changed, 3 insertions(+), 1 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..c2d4646 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
@@ -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);

--
Gitblit v1.8.0