From 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 12 三月 2019 16:29:55 +0800
Subject: [PATCH] 冲突提交
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java | 14 +++++++++++---
1 files changed, 11 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 3bd6a64..57b6f84 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
@@ -39,13 +39,13 @@
BigDecimal getMyHB(Long id);
// 鏍规嵁AppId涓庡井淇nionID鑾峰彇鐢ㄦ埛
- UserInfo getUserInfoByAppIdAndWXUnionId(@Param("appId") String appId, @Param("unionId") String unionId);
+ List<UserInfo> listByAppIdAndWXUnionId(@Param("appId") String appId, @Param("unionId") String unionId);
// 鏍规嵁AppId涓庢窐瀹漁penId鑾峰彇鐢ㄦ埛
- UserInfo getUserInfoByAppIdAndTaoBaoOpenId(@Param("appId") String appId, @Param("openId") String openId);
+ List<UserInfo> listByAppIdAndTaoBaoOpenId(@Param("appId") String appId, @Param("openId") String openId);
// 鏍规嵁AppId涓庣數璇濆彿鐮佽幏鍙栫敤鎴�
- UserInfo getUserInfoByAppIdAndPhone(@Param("appId") String appId, @Param("phone") String phone);
+ List<UserInfo> listByAppIdAndPhone(@Param("appId") String appId, @Param("phone") String phone);
Long getMaxUid();
@@ -167,4 +167,12 @@
*/
UserInfo getInfoByPhoneOrInviteCode(@Param("phone")String phone, @Param("inviteCode")String inviteCode);
+
+
+ // 鏍规嵁AppId涓庣數璇濆彿鐮佽幏鍙栫敤鎴�
+ List<UserInfo> listByClosed(@Param("appId") String appId, @Param("phone") String phone);
+
+
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0