From 143160118ab3937ae9e340f61aafa764756856c8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 17 十月 2019 14:58:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserInfoCountService.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserInfoCountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserInfoCountService.java
index ff2dd95..6ca35f1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserInfoCountService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserInfoCountService.java
@@ -69,9 +69,9 @@
 	 * @param count
 	 * @return
 	 */
-	public List<UserGoldCoinVO> listByUserGoldCoin(long start, int count, int type);
+	public List<UserGoldCoinVO> listByUserGoldCoin(long start, int count, int type, String key);
 
-	public long countByUserGoldCoin(int type);
+	public long countByUserGoldCoin(int type, String key);
 
 	/**
 	 * 缁熻鍓╀綑閲戝竵
@@ -79,8 +79,8 @@
 	 * @param count
 	 * @return
 	 */
-	public List<UserGoldCoinVO> listByHasGoldCoin(long start, int count);
+	public List<UserGoldCoinVO> listByHasGoldCoin(long start, int count, String key);
 
-	public long countByHasGoldCoin();
+	public long countByHasGoldCoin(String key);
 	
 }

--
Gitblit v1.8.0