Merge branch 'master' into master-test

wangrenhuang

2023-10-23 85d1dc328bd46089b63b57bd356908cbba26e29c

 phis-feign/src/main/java/com/hz/his/dto/user/usercompleteInfo/UserInfoCompleteDto.java

@@ -17,7 +17,7 @@
    //邮箱
    private String email;
    //证件类型
    private String certificateType;
    private Integer certificateType;
    //证件号码
    private String certificateNo;
    //出生日期
@@ -89,11 +89,11 @@
        this.email = email;
    }

    public String getCertificateType() {
    public Integer getCertificateType() {
        return certificateType;
    }

    public void setCertificateType(String certificateType) {
    public void setCertificateType(Integer certificateType) {
        this.certificateType = certificateType;
    }