Merge branch 'master-fwq-团购提前扣取金额' into master-test

fwq

2024-06-14 5d542ef50426fdaf5c06d09f6a7c5d13529ea4ac

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

@@ -42,6 +42,8 @@
    private List<UserPretriageProjectDto> pretriageProjectList;
    //标签list
    private List<UserPretriageLabelDto>pretriageLabelList;
    //初诊卡标签list
    private List<UserPretriageLabelDto> firstVisitLabelList;

    //预约单ID
    private String appointmentId;
@@ -216,4 +218,12 @@
    public void setLabelIds(List<String> labelIds) {
        this.labelIds = labelIds;
    }

    public List<UserPretriageLabelDto> getFirstVisitLabelList() {
        return firstVisitLabelList;
    }

    public void setFirstVisitLabelList(List<UserPretriageLabelDto> firstVisitLabelList) {
        this.firstVisitLabelList = firstVisitLabelList;
    }
}