From 02d8f36a2a51a2ffcacdb619bee34077da61b328 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 10 一月 2019 15:23:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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 9630e99..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
@@ -156,10 +156,10 @@
 	 * @return
 	 */
 	public List<QualityFactory> listRecommendBykey(long start, int count, String key, Integer hasQuan,
-			Integer userType, Double startprice, Double endprice, Integer sort);
+			Integer userType, Double startprice, Double endprice, Double startTkRate, Double endTkRate, Integer sort);
 	
 	public long countRecommendBykey(String key, Integer hasQuan, Integer userType, 
-			Double startprice, Double endprice);
+			Double startprice, Double endprice, Double startTkRate, Double endTkRate);
 	
 	
 	/**
@@ -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