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

admin

2019-09-02 34b542007f7e0dd4e1fdffecbd12a377aa953d68

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