fix

netflix-service/src/main/java/com/cyksj/service/user/impl/UserServiceImpl.java

@@ -72,8 +72,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
 		user = Optional.ofNullable(user).orElseGet(() -> new User()
 				.setUnionid(unionid));
-		user.setNickname(info.getNickname())
-				.setCountry(info.getCountry())
+		user.setCountry(info.getCountry())
 				.setProvince(info.getProvince())
 				.setCity(info.getCity());
 		if (user.getSex() == null) {
@@ -82,6 +81,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 		if (StrUtil.isEmpty(user.getHeadimgurl())) {
 			user.setHeadimgurl(info.getHeadimgurl());
 		}
+		if (StrUtil.isEmpty(user.getNickname())) {
+			user.setNickname(info.getNickname());
+		}
 		user.setUnionid(unionid);
 		user.setOpenId(info.getOpenid());
 		Boolean isNewUser = false;