From 1faf3ab0ba6c17eee48e68e8d0077ea61f45d75d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 20:19:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java
index 2e84803..2edfbe9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java
@@ -94,11 +94,13 @@
List<UserInfoVO> query(@Param("start") long start, @Param("count") int count, @Param("userState") Integer userState,
@Param("key") String key, @Param("keyType") Integer keyType, @Param("userRank") String userRank,
@Param("days") Integer days, @Param("startTime") String startTime, @Param("endTime") String endTime,
- @Param("orderField") Integer orderField, @Param("orderMode") Integer orderMode);
+ @Param("orderField") Integer orderField, @Param("orderMode") Integer orderMode,
+ @Param("userType") Integer userType, @Param("level")String level, @Param("activeCode") Integer activeCode);
long queryCount(@Param("userState") Integer userState, @Param("key") String key, @Param("keyType") Integer keyType,
@Param("userRank") String userRank, @Param("days") Integer days, @Param("startTime") String startTime,
- @Param("endTime") String endTime);
+ @Param("endTime") String endTime,@Param("userType") Integer userType, @Param("level")String level,
+ @Param("activeCode") Integer activeCode);
/**
* 缁熻褰撳墠鏌ヨ缁撴灉鎬婚噾棰�
@@ -195,7 +197,7 @@
* @param inviteCode
* @return
*/
- UserInfo getInfoByPhoneOrInviteCode(@Param("phone") String phone, @Param("inviteCode") String inviteCode);
+ UserInfo getUserInfoByInviteCode(@Param("inviteCode") String inviteCode);
// 鏍规嵁AppId涓庣數璇濆彿鐮佽幏鍙栫敤鎴�
List<UserInfo> listByClosed(@Param("appId") String appId, @Param("phone") String phone);
--
Gitblit v1.8.0