Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

 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);
	
}