Merge remote-tracking branch 'origin/master' into div

yujian

2019-06-24 cb6f69f1207ab6cc9c6006515cb831833cfe0d36

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java

@@ -566,4 +566,19 @@
      return isNew;

   }

   

	
   @Override

   public UserRank gerUserRank(Long uid) {

      if(uid == null) {

         return null;

      }

		
      UserInfoExtra userInfoExtra = userInfoExtraMapper.gerUserRank(uid);

      if (userInfoExtra == null) {

         return null;

      }

      return userInfoExtra.getUserRank();

   }

	
	
}