Merge remote-tracking branch 'origin/master'

liusheng

8 天以前 48cd106bef20f5a39ff6318f2e3d930437741f5b

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

@@ -340,4 +340,19 @@
     */
    @ApiModelProperty(value = "结束入院日期")
    private Date endInHospTime;

    /**
     * 经管医生
     */
    @ApiModelProperty("经管医生")
    @Excel(name = " 经管医生 ")
    private String managementDoctor;

    /**
     * 经管医生
     */
    @ApiModelProperty("经管医生")
    @Excel(name = " 经管医生 ")
    private String managementDoctorCode;
}