Merge branch 'feature' into 'dev'

新增用户中心注册功能6

See merge request !149

src/main/java/com/zhiwei/brandkbs2/service/impl/UserServiceImpl.java

@@ -148,6 +148,7 @@ public class UserServiceImpl implements UserService {
             // 优先使用用户中心信息
             if (null != centerUser) {
                 newUser = User.createFromCenterUser(centerUser);
+                newUser.setNickname(userDTO.getNickname());
                 newUser.setRoles(Collections.singletonList(UserRole.createFromUserDto(userDTO)));
                 newUser.setSuperAdmin(false);
             } else {
@@ -237,6 +238,7 @@ public class UserServiceImpl implements UserService {
         // 优先使用用户中心信息
         if (null != centerUser) {
             newUser = User.createFromCenterUser(centerUser);
+            newUser.setNickname(userDTO.getNickname());
             newUser.setSuperAdmin(true);
         } else {
             newUser = createNewUser(userDTO);