From 055fb8d085efd7e120d69aba6c0fbb8db5867553 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 七月 2020 14:37:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java
index d9a3707..5767ddb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java
@@ -226,6 +226,14 @@
 	 */
 	public UserInfo selectAvailableByPrimaryKey(Long uid);
 
+	
+	
+	public long countInfo(Integer userState, String key, Integer keyType, String userRank, Integer days, String startTime,
+			String endTime, Integer userType, String level, Integer activeCode);
+
+	public List<UserInfoVO> queryInfo(long start, int count, Integer userState, String key, Integer keyType, String userRank,
+			Integer days, String startTime, String endTime, Integer userType, String level, Integer activeCode);
+
 
 
 }

--
Gitblit v1.8.0