From d146e7bca73c7605af6b718b5df0b757e0034f0e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 18 十二月 2018 11:17:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java |   11 ++++++++++-
 1 files changed, 10 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 e3accbb..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,8 +337,17 @@
 	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, 
+			@Param("list") List<Long> list, @Param("gid") Long gid,@Param("systemCid") Long systemCid);
+
+
 }

--
Gitblit v1.8.0