Merge branch 'master' into master-任务组

陈昶聿

6 小时以前 6e3d0a2097a4d841e941a84ec54780a67eb60ba1

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

@@ -188,4 +188,7 @@
    @ApiModelProperty(value = "经管医生姓名")
    private String JingGuanYSXM;

    @ApiModelProperty(value = "短号信息")
    private String DuanHaoXX;

}