From 148af6b2f57be264c84d0991237fbd7ddea491a4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 04 十一月 2019 09:55:55 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoModifyRecordServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoModifyRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoModifyRecordServiceImpl.java
index a82ace5..adfdc6b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoModifyRecordServiceImpl.java
+++ b/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("杩斿埄鍒�")&&!user.getNickName().startsWith(Constant.systemCommonConfig.getDefaultNickName())) {
 			addModifyRecord(uid, ModifyTypeEnum.nickName, user.getNickName() + "");
 		}
 

--
Gitblit v1.8.0