From ca81ac257960fcb135fe542a49c28bc871b14e2a Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 13 五月 2019 09:29:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master_develop

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/activity/ActivityService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/activity/ActivityService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/activity/ActivityService.java
index 4778eb6..55040ef 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/activity/ActivityService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/activity/ActivityService.java
@@ -159,7 +159,7 @@
 	 * 
 	 * @return
 	 */
-	public long getRecommendActivityCount();
+	public long getRecommendActivityCount(String title);
 
 	
 	public long getRecommendActivityCountCache();

--
Gitblit v1.8.0