Merge remote-tracking branch 'origin/master'

sinake

2 天以前 533ffe54ffc7f0f39b9df8f7d99fee4880b50952

 ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/RelativeConfirmationBaseInfoDTO.java

@@ -145,21 +145,21 @@
     */
    @ApiModelProperty("签字人与捐赠者关系 根据字典sys_FamilyRelation")
    @Excel(name = "签字人与捐赠者关系 根据字典sys_FamilyRelation")
    private String signFamilyRelations;
    private String signfamilyrelations;

    /**
     * 捐献决定 见字典sys_OrganDecision
     */
    @ApiModelProperty("捐献决定 见字典sys_OrganDecision")
    @Excel(name = "捐献决定 见字典sys_OrganDecision")
    private String organDecision;
    private String organdecision;

    /**
     * 捐献决定 其他
     */
    @ApiModelProperty("捐献决定 其他")
    @Excel(name = "捐献决定 其他")
    private String organDecisionOther;
    private String organdecisionOther;

    /**
     * 年龄
@@ -280,4 +280,16 @@
     */
    @ApiModelProperty("家属意见备注")
    private String relativeRemark;

    /**
     * 家属意见备注
     */
    @ApiModelProperty("亲属姓名")
    private String relativeconfirmationsignname;

    /**
     * 家属意见备注
     */
    @ApiModelProperty("亲属证件号")
    private String relativeidcardno;
}