From 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 29 四月 2019 08:59:47 +0800
Subject: [PATCH] Merge branch 'div_develop' into master_develop
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java | 9 ++++++++-
1 files changed, 8 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 b3d1cf6..3a3c31e 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
@@ -47,7 +47,14 @@
// 鏍规嵁AppId涓庣數璇濆彿鐮佽幏鍙栫敤鎴�
List<UserInfo> listByAppIdAndPhone(@Param("appId") String appId, @Param("phone") String phone);
-
+
+ // 鏍规嵁鑾峰彇鐢佃瘽鍙风爜鏈夋晥鐢ㄦ埛
+ UserInfo getEffectiveUserInfoByPhone(@Param("phone") String phone);
+
+ // 鏍规嵁鑾稺XUnionId鏈夋晥鐢ㄦ埛
+ UserInfo getEffectiveUserInfoByWXUnionId(@Param("unionId") String unionId);
+
+
Long getMaxUid();
/**
--
Gitblit v1.8.0