From 9666caad786d890ace2df4594e71cee47bb489b9 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期五, 23 十一月 2018 09:22:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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..cbd5fbf 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);
 	
 	
 	/**

--
Gitblit v1.8.0