From 7ba5c2575d8c13ce53d5d562fe7f6b649e7778b5 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期三, 14 十一月 2018 17:55:58 +0800
Subject: [PATCH] Merge branch 'dev1'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java
index 34f1eee..c062454 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java
@@ -244,15 +244,15 @@
 	
 	@Override
 	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) {
 		return qualityFactoryMapper.listRecommendBykey(start, count, key, hasQuan, userType,
-				startprice, endprice, sort);
+				startprice, endprice, startTkRate, endTkRate, sort);
 	}
 
 	@Override
 	public long countRecommendBykey(String key, Integer hasQuan, Integer userType,
-			Double startprice, Double endprice) {
-		return qualityFactoryMapper.countRecommendBykey(key, hasQuan, userType, startprice, endprice);
+			Double startprice, Double endprice, Double startTkRate, Double endTkRate) {
+		return qualityFactoryMapper.countRecommendBykey(key, hasQuan, userType, startprice, endprice, startTkRate, endTkRate);
 	}
 	
 	

--
Gitblit v1.8.0