From 2bb5bd3c989dcdb07779e3d870d567cd8a06ffa5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 18:21:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoCountMapper.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 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 c0c8786..ba4fb72 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,10 +15,10 @@
 	 * @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);
+	long countByUserGoldCoin(@Param("type")int type, @Param("key") String key);
 	
 	
 	/**
@@ -28,8 +28,9 @@
 	 * @param type
 	 * @return
 	 */
-	List<UserGoldCoinVO> listByHasGoldCoin(@Param("start")long start, @Param("count")int count);
+	List<UserGoldCoinVO> listByHasGoldCoin(@Param("start")long start, @Param("count")int count, @Param("key") String key);
 	
 	
-	long countByHasGoldCoin();
+	long countByHasGoldCoin(@Param("key") String key);
+	
 }
\ No newline at end of file

--
Gitblit v1.8.0