From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:36:49 +0800
Subject: [PATCH] 冲突文件

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserInfoExtraMapper.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserInfoExtraMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserInfoExtraMapper.java
index 42c3969..9b95fac 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserInfoExtraMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserInfoExtraMapper.java
@@ -36,4 +36,12 @@
 	 */
 	long countByRankId(Long rankId);
 	
+	
+	/**
+	 * 鑾峰彇鐢ㄦ埛闄勫姞淇℃伅
+	 * @param uid
+	 * @return
+	 */
+	UserInfoExtra gerUserRank(Long uid);
+	
 }
\ No newline at end of file

--
Gitblit v1.8.0