Merge branch 'master' of http://116.62.18.175:6699/r/opo-qd

yxh

4 天以前 d42096fd55c4b0caf84bb4f208b4e17534e158c1

 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java

@@ -442,5 +442,19 @@
    @ApiModelProperty("是否捐献0不捐献1捐献")
    private Integer isDonate;

    /**
     * ICU评估医生
     */
    @ApiModelProperty("ICU评估医生")
    @Excel(name = "ICU评估医生")
    private String icuDoctor;

    /**
     * $column.columnComment
     */
    @ApiModelProperty("ICU评估医生手机号")
    @Excel(name = "ICU评估医生手机号")
    private String icuDoctorPhone;

}