Merge branch 'master-2.0-pre-rename' into div

admin

2019-09-11 e6670f2a6513c0f1d6e4f2d867d1010970014849

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

@@ -113,7 +113,7 @@
         addModifyRecord(uid, ModifyTypeEnum.bindWeiXin, user.getWxUnionId());

      }



      if (user.getNickName() != null && !user.getNickName().startsWith("返利券")) {

      if (user.getNickName() != null && !user.getNickName().startsWith("板栗快省")) {

         addModifyRecord(uid, ModifyTypeEnum.nickName, user.getNickName() + "");

      }