From 148af6b2f57be264c84d0991237fbd7ddea491a4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 04 十一月 2019 09:55:55 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoCountMapper.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoCountMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoCountMapper.java
index c3542f2..78b9d8b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoCountMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoCountMapper.java
@@ -15,5 +15,21 @@
 	 * @param type
 	 * @return
 	 */
-	List<UserGoldCoinVO> listByUserGoldCoin(@Param("start")long start, @Param("count")int count, @Param("type")int type);
+	List<UserGoldCoinVO> listByUserGoldCoin(@Param("start")long start, @Param("count")int count, @Param("type")int type, @Param("key") String key);
+	
+	
+	long countByUserGoldCoin(@Param("type")int type, @Param("key") String key);
+	
+	
+	/**
+	 * 缁熻鐢ㄦ埛绱鑾峰緱閲戝竵锛屾秷鑰楅噾甯�
+	 * @param start
+	 * @param count
+	 * @param type
+	 * @return
+	 */
+	List<UserGoldCoinVO> listByHasGoldCoin(@Param("start")long start, @Param("count")int count, @Param("key") String key);
+	
+	
+	long countByHasGoldCoin(@Param("key") String key);
 }
\ No newline at end of file

--
Gitblit v1.8.0