From 06a7debe678e7ae30f39c61a7f71a926d52d1ae7 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期二, 13 十一月 2018 10:26:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 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 9f7e01e..d277dbe 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
@@ -334,7 +334,17 @@
 	 * @param key 鍏抽敭璇�
 	 * @return
 	 */
-	List<QualityFactory> listRecommendBykey(@Param("start") long start, @Param("count") int count, @Param("key") String key);
+	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("sort") Integer sort);
 	
-	long countRecommendBykey(@Param("key") String key);
+	long countRecommendBykey(@Param("key") String key, @Param("hasQuan") Integer hasQuan,  
+			@Param("userType") Integer userType,@Param("startprice") Double startprice, @Param("endprice") Double endprice);
+
+
+	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