From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'

---
 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