Merge remote-tracking branch 'origin/master'

liusheng

昨天 d1533f3fe617a98eb8782047e4c4ad81f3924fcf

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

@@ -49,4 +49,7 @@

    @ApiModelProperty(value = "诊断名称")
    private String ZhenDuanMC;

    @ApiModelProperty(value = "Icd10")
    private String Icd10;
}