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

yujian

2019-09-03 9b4ac7970d5694fb39dfc616b623ee121d58ae27

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

@@ -258,7 +258,7 @@
      }



      if (StringUtil.isNullOrEmpty(nickName))

         nickName = Constant.systemCommonConfig.getDefaultNickName();

         nickName = Constant.systemCommonConfig.getDefaultNickName() + inviteId;



      if (StringUtil.isNullOrEmpty(portrait))

         portrait = Constant.systemCommonConfig.getDefaultPortrait();