Merge remote-tracking branch 'origin/master'

liusheng

6 天以前 fb9c56894fcee50e17f47253728a4ef0f16a1e0a

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

@@ -476,6 +476,13 @@
    private String leavediagname;

    /**
     * 入院诊断名称
     */
    @Excel(name = "  入院诊断名称")
    @ApiModelProperty(value = "入院诊断名称")
    private String diagname;

    /**
     * 患者ID
     */
    @Excel(name = "  患者ID")