From 90b211c63f9d596aa90b508f76eb916a30b68731 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 02 八月 2019 16:01:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/HotSearchMapper.java |   56 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/HotSearchMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/HotSearchMapper.java
index d5e6677..a147749 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/HotSearchMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/HotSearchMapper.java
@@ -1,29 +1,29 @@
-package com.yeshi.fanli.dao.mybatis.goods;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.bus.search.HotSearch;
-
-public interface HotSearchMapper extends BaseMapper<HotSearch>{
-
-	/**
-	 * 鏌ヨ
-	 * @param start
-	 * @param count
-	 * @param key
-	 * @param systemId
-	 * @return
-	 */
-	List<HotSearch> listQuery(@Param("start") long start, @Param("count") int count, 
-			@Param("key") String key, @Param("systemId")Long systemId);
-	/**
-	 * 鏌ヨ缁熻
-	 * @param key
-	 * @param systemId
-	 * @return
-	 */
-	int countQuery(@Param("key") String key, @Param("systemId")Long systemId);
+package com.yeshi.fanli.dao.mybatis.goods;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.bus.search.HotSearch;
+
+public interface HotSearchMapper extends BaseMapper<HotSearch>{
+
+	/**
+	 * 鏌ヨ
+	 * @param start
+	 * @param count
+	 * @param key
+	 * @param systemId
+	 * @return
+	 */
+	List<HotSearch> listQuery(@Param("start") long start, @Param("count") int count, 
+			@Param("key") String key, @Param("systemId")Long systemId, @Param("useType")Integer useType);
+	/**
+	 * 鏌ヨ缁熻
+	 * @param key
+	 * @param systemId
+	 * @return
+	 */
+	int countQuery(@Param("key") String key, @Param("systemId")Long systemId, @Param("useType")Integer useType);
 }
\ No newline at end of file

--
Gitblit v1.8.0