From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/activity/ActivityService.java |   15 ++++++++++++++-
 1 files changed, 14 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..78e25ec 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();
@@ -255,4 +255,17 @@
 	 * @param goods
 	 */
 	public void updateRecommendActivityGoods(TaoBaoGoodsBrief goods);
+	
+	/**
+	 * 鏌ヨ闇�鍙戝竷鐨勫姩鎬�
+	 * @return
+	 */
+	public List<RecommendActivity> getNeedPublish();
+
+	/**
+	 * 鍔ㄦ�佸浘鐗�
+	 * @param activityId
+	 * @return
+	 */
+	public List<String> getImgByActivityId(Long activityId);
 }

--
Gitblit v1.8.0