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/service/impl/activity/ActivityServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java
index 5cb0442..d714db8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java
@@ -120,8 +120,8 @@
 	}
 
 	@Override
-	public long getRecommendActivityCount() {
-		return recommendActivityMapper.getRecommendActivityCount();
+	public long getRecommendActivityCount(String title) {
+		return recommendActivityMapper.getRecommendActivityCount(title);
 	}
 
 	@Override

--
Gitblit v1.8.0