Merge branch 'fhx-prod-用户建档' into master-test

fhx

2023-08-01 2c1993b0c00928b1eef458cf9f6a5abe9dbce64c

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

@@ -30,6 +30,8 @@
    private Integer gender = SEX_WUMAN;
    /** 主电话号码 */
    private String tel;
    /** 电话区码 */
    private String telCode;
    /** 客户类型 */
    private String userType;