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/dao/mybatis/lable/QualityFactoryMapper.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java
index d277dbe..9cf783c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java
@@ -337,10 +337,13 @@
 	List<QualityFactory> listRecommendBykey(@Param("start") long start, @Param("count") int count, 
 			@Param("key") String key,@Param("hasQuan") Integer hasQuan,  @Param("userType") Integer userType,
 			@Param("startprice") Double startprice, @Param("endprice") Double endprice,
+			@Param("startTkRate") Double startTkRate, @Param("endTkRate") Double endTkRate,
 			@Param("sort") Integer sort);
 	
 	long countRecommendBykey(@Param("key") String key, @Param("hasQuan") Integer hasQuan,  
-			@Param("userType") Integer userType,@Param("startprice") Double startprice, @Param("endprice") Double endprice);
+			@Param("userType") Integer userType,@Param("startprice") Double startprice, 
+			@Param("endprice") Double endprice,@Param("startTkRate") Double startTkRate, 
+			@Param("endTkRate") Double endTkRate);
 
 
 	List<QualityFactory> listQueryBylabIDs(@Param("start") long start, @Param("count") int count, 

--
Gitblit v1.8.0