From dbc8f0b2058d809e6dad0ada92d391109cbb4f57 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 15 十一月 2019 15:05:53 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoExtraMapper.xml |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoExtraMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoExtraMapper.xml
index 5c887c1..8607de4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoExtraMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoExtraMapper.xml
@@ -38,8 +38,7 @@
 		</association>
 
 		<association property="userRank" column="uie_rank_id"
-			javaType="com.yeshi.fanli.entity.bus.user.UserRank">
-			<id column="uie_rank_id" property="id" jdbcType="BIGINT" />
+			javaType="com.yeshi.fanli.entity.bus.user.UserRank" select="com.yeshi.fanli.dao.mybatis.user.UserRankMapper.selectByPrimaryKey">
 		</association>
 	</resultMap>
 

--
Gitblit v1.8.0