From 2e53c542b4dfac6d1e62c7a2e7d21a3984e797c2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 11 十一月 2019 17:24:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/shop/BanLiShopGoodsSetsMapper.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/shop/BanLiShopGoodsSetsMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/shop/BanLiShopGoodsSetsMapper.java
index 0adc5aa..30a8cdb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/shop/BanLiShopGoodsSetsMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/shop/BanLiShopGoodsSetsMapper.java
@@ -27,7 +27,8 @@
 	 * @param count
 	 * @return
 	 */
-	List<BanLiShopGoodsSets> listQuery(@Param("start") long start, @Param("count") int count, @Param("key") String key);
+	List<BanLiShopGoodsSets> listQuery(@Param("start") long start, @Param("count") int count, 
+			@Param("key") String key, @Param("goodsId")Long goodsId);
 
 	/**
 	 * 璁℃暟
@@ -36,5 +37,5 @@
 	 * @param state
 	 * @return
 	 */
-	long countQuery(@Param("key") String key);
+	long countQuery(@Param("key") String key, @Param("goodsId")Long goodsId);
 }
\ No newline at end of file

--
Gitblit v1.8.0