From e9285f6e48b26bdd494569e660006ec87f3ad66b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 31 十月 2019 14:00:43 +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 | 8 ++++----
1 files changed, 4 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..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,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,8 @@
* @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