From 1fd8f11537bb74c1f7e611e35a766cbbd34eff05 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 18:14: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/UserInfoMapper.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 47c9ef8..84feedf 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
@@ -59,6 +59,9 @@
// 鏍规嵁鑾稺XUnionId鏈夋晥鐢ㄦ埛
UserInfo getEffectiveUserInfoByWXUnionId(@Param("unionId") String unionId);
+
+ //鏍规嵁寰俊openid鏌ヨ
+ UserInfo getEffectiveUserInfoByWXOpenId(@Param("wxOpenId") String wxOpenId);
Long getMaxUid();
@@ -192,7 +195,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