Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/UserServiceImpl.java

@@ -72,7 +72,9 @@ public class UserServiceImpl implements UserService {
         u.setUserTel(user.getUid());
         u.setEnable((short) 1);
         u.setUserEmail(user.getSecondUID());
-        u.setUserUU(Long.valueOf(user.getDialectUID()));
+        if (!StringUtils.isEmpty(user.getDialectUID())) {
+            u.setUserUU(Long.valueOf(user.getDialectUID()));
+        }
         u.setPwdSecLevel(user.getPwdSecLevel());
         u.setLastLoginTime(user.getLastLoginTime());
         Enterprise enterprise = null;