Merge branch 'master' into master-手术随访

陈昶聿

昨天 e12b7983327f4881f91c8d081c52abbbf5bbc1e4

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

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

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

}