提交 a36d3d20 编写于 作者: zhehao.chen's avatar zhehao.chen

Merge branch 'release' into 'master'

Release

See merge request !108
流水线 #44750 已失败 于阶段
......@@ -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());
......
......@@ -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;
}
......
......@@ -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;
}
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册