From 2dff570ccfa532f8c012bc13829b302dd3e1b9d3 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期六, 29 十二月 2018 15:39:29 +0800
Subject: [PATCH] Merge branch 'master' into div1

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java
index cbd5fbf..c08e07e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java
@@ -169,7 +169,7 @@
 	 * @param proportion  璁＄畻姣斾緥
 	 * @return
 	 */
-	public JSONArray  getRecommendToIndex(long start, int count, String proportion, String fcRate);
+	public JSONArray  getRecommendToIndex(long start, int count, String proportion);
 	
 	public long countRecommendToIndex(String proportion);
 	

--
Gitblit v1.8.0