From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 20 五月 2020 17:25:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2 --- fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 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 e246837..d9a3707 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 @@ -53,7 +53,6 @@ public long getUserCount(); - public boolean inviteWXUserInfo(String code, UserInfo inviter); public void unBindUserInfo(UserInfo find, int type); @@ -81,10 +80,11 @@ * @return */ public List<UserInfoVO> query(long start, int count, Integer userState, String key, Integer keyType, - String userRank, Integer days, String startTime, String endTime, Integer orderField, Integer orderMode,Integer userType); + String userRank, Integer days, String startTime, String endTime, Integer orderField, Integer orderMode, + Integer userType, String level, Integer activeCode); public long queryCount(Integer userState, String key, Integer keyType, String userRank, Integer days, - String startTime, String endTime,Integer userType); + String startTime, String endTime, Integer userType, String level, Integer activeCode); public double querySumMoney(String key, Integer userType, Integer days, String startTime, String endTime); @@ -226,4 +226,6 @@ */ public UserInfo selectAvailableByPrimaryKey(Long uid); + + } -- Gitblit v1.8.0