Merge branch 'master' into master-test

wangrenhuang

2023-11-06 155905061b3aa29d2aa23e5693e8704debfb9828

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

@@ -157,6 +157,18 @@
    /** 性别0未知1男2女 */
    private Integer gender;

    /**是否转诊*/
    private Integer isTransfer;
    /**转诊信息*/
    private UserTransferDto transferRecord;

    /**主要诉求**/
    private String mainAppeal;
    private String minorAppeal;

    /**是否处理可是*/
    private Integer isEditFamiliesRoom = 0;

    public UserParamDto() {
    }