From 522315ae42936583042fc08aabda7e3c9e7a7b5d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 15:37:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/dynamic/GoodsEvaluateService.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/dynamic/GoodsEvaluateService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/dynamic/GoodsEvaluateService.java
index 3a974d3..2bb7781 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/dynamic/GoodsEvaluateService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/dynamic/GoodsEvaluateService.java
@@ -43,9 +43,9 @@
 	 * @param state
 	 * @return
 	 */
-	public List<GoodsEvaluate> query(int start, int count, String key, Integer state, int dynamicType);
+	public List<GoodsEvaluate> query(int start, int count, String key, Integer state, int dynamicType, String typeEnum);
 
-	public long count(String key, Integer state,int dynamicType);
+	public long count(String key, Integer state,int dynamicType, String typeEnum);
 
 	
 	/**
@@ -92,7 +92,7 @@
 	public void saveCurrencyCoupon(String pid, int kind, CommentInfo commentInfo) throws GoodsEvaluateException, Exception;
 
 
-	public void saveActivityPic(String pid, ImgInfo imgInfo, MultipartHttpServletRequest fileRequest)
+	public void saveActivityPic(String pid, ImgInfo imgInfo, String picUrls, MultipartHttpServletRequest fileRequest)
 			throws GoodsEvaluateException, Exception;
 
 

--
Gitblit v1.8.0