--no commit message

com.zrqx.member/src/main/java/com/zrqx/member/fg/permissions/FgPermissionsController.java

@@ -568,7 +568,7 @@ public class FgPermissionsController {
 			info.setToken(token);
 			redis.set(token, info);
 		}else{
-			if(m.getWechatKey() != member.getWechatKey()){
+			if(StringUtils.isNotBlank(member.getWechatKey()) && m.getWechatKey() != member.getWechatKey()){
 				throw new BaseException("当前手机号已绑定其他微信，请更换手机号");
 			}else{
 				//合并用户