Merge remote-tracking branch 'origin/master'

liusheng

昨天 d1533f3fe617a98eb8782047e4c4ad81f3924fcf

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

@@ -26,7 +26,4 @@
    @ApiModelProperty(value = "疾病编码")
    private String Icd10;

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

}