Merge branch 'release' into dev-cloud-pharmacy-20200901

server/src/main/java/com/pica/cloud/account/account/server/service/impl/LoginServiceImpl.java

@@ -407,8 +407,12 @@ public class LoginServiceImpl implements LoginService {
                 account.setId(userId);
                 account.setAcctId(acctId.intValue());
                 account.setCreatTime(new Date());
-                //account.setMobilePhone(request.getMobile());
-                account.setMobilePhone("");
+                Doctor d = doctorInfoMapper.selectByPrimaryKey(Math.toIntExact(userId));
+                if (d != null && StringUtils.isNotBlank(d.getMobilePhone())){
+                    account.setMobilePhone(AESUtil.decryptV0(d.getMobilePhone()));
+                } else {
+                    account.setMobilePhone("");
+                }
                 account.setRegisterSource(request.getSourceType());
                 String newToken = tokenUtils.generateToken(account);
                 LoginResult result = new LoginResult();