From aa784ab65cc24caf45a4c38af7e5fdeb526eb393 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 五月 2019 14:49:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/activity/ActivityService.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 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 55040ef..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
@@ -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