Merge branch 'master' into master-任务组

陈昶聿

4 小时以前 6e3d0a2097a4d841e941a84ec54780a67eb60ba1

 smartor/src/main/java/com/smartor/domain/ExternalInHospPatientDiagnoseInfo.java

@@ -23,4 +23,7 @@
    @ApiModelProperty(value = "入院诊断名称")
    private String ZhenDuanMC;

    @ApiModelProperty(value = "疾病编码")
    private String Icd10;

}