Merge branch 'rx-1023-营销优惠券新版' into master-prod-new

rx

2023-10-31 8fc8c4954bb9d048b432e6a8dbe801c79ebe357b

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

@@ -154,6 +154,20 @@
    private String opId;
    //修改操作的备注
    private String note;
    /** 性别0未知1男2女 */
    private Integer gender;

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

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

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

    public UserParamDto() {
    }