Merge branch 'dev-1223' into 'release'

dev-1223 into release



See merge request !69

server/src/main/java/com/pica/cloud/account/account/server/entity/LoginResult.java

@@ -36,6 +36,16 @@ public class LoginResult {
 
     private String differentMessage;
 
+    private String lastMobile;
+
+    public String getLastMobile() {
+        return lastMobile;
+    }
+
+    public void setLastMobile(String lastMobile) {
+        this.lastMobile = lastMobile;
+    }
+
     public Boolean getCheckStatus() {
         return checkStatus;
     }

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

@@ -164,7 +164,7 @@ public class LoginV1ServiceImpl implements LoginV1Service {
                             result = new LoginResult();
                             result.setCheckStatus(false);
                             result.setSuggestMessage("为保证学习记录完整，建议使用同一手机号进行登录");
-                            result.setMobile(mobilePhone);
+                            result.setLastMobile(mobilePhone);
 
                             String begin = mobilePhone.substring(0, 3);
                             String end = mobilePhone.substring(7, 11);