Merge branch 'dev-0401' into 'release'

Dev 0401

See merge request !104

server/src/main/java/com/pica/cloud/account/account/server/controller/LoginController.java

@@ -430,7 +430,7 @@ public class LoginController extends AccountBaseController {
     public PicaResponse<String> loginQRCode() {
         BaseRequest request = new BaseRequest();
         request.setProductType(1);
-        request.setSourceType(6);
+        request.setSourceType(3);
         request.setLoginIp(super.getIpAddr());
         request.setUserTokenTourist(super.getUserTokenTourist());
         request.setMobile(this.fetchPicaUser().getMobile());

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

@@ -11,6 +11,7 @@ public class PICAPDoctor {
     private Integer sex;
     private String name;
     private String mobile_phone;
+    private String mobilePhone;
     private Integer status;
     private Integer type;
     private Integer hospital_id;
@@ -67,6 +68,14 @@ public class PICAPDoctor {
     private Integer create_id;
     protected Date create_time;
 
+    public String getMobilePhone() {
+        return mobilePhone;
+    }
+
+    public void setMobilePhone(String mobilePhone) {
+        this.mobilePhone = mobilePhone;
+    }
+
     public Date getBirthday() {
         return this.birthday;
     }

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

@@ -669,6 +669,7 @@ public class LoginServiceImpl implements LoginService {
         if (doctor == null) {
             doctor = new PICAPDoctor();
         }
+        doctor.setMobilePhone(EncryptUtils.decryptContent(doctor.getMobile_phone(),EncryptConstants.ENCRYPT_TYPE_MOBILE,EncryptConstants.ENCRYPT_DECRYPT_KEY));
         doctor.setAvatar_image_url(this.processDoctorAvatar(doctor.getAvatar_image_url()));
         return doctor;
     }