Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-11-15 dbc8f0b2058d809e6dad0ada92d391109cbb4f57

 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>