From 2764ae2d7f4d9cb9810a2188c92cb2eb439c3f22 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 09 五月 2019 13:07:02 +0800
Subject: [PATCH] 冲突

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