Merge branch 'master' into master-任务组

陈昶聿

2 天以前 fcb98e4558897945a316d04555923355b8e60605

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

@@ -64,10 +64,24 @@
    @ApiModelProperty(value = "删除标记")
    private String delFlag;


    @ApiModelProperty(value = "进制")
    private String radix;

    @ApiModelProperty(value = "外链地址")
    private String url;

    @ApiModelProperty(value = "病区编码")
    private String wardCode;

    @ApiModelProperty(value = "病区名称")
    private String wardName;

    @ApiModelProperty(value = "科室编码")
    private String deptCode;

    @ApiModelProperty(value = "科室名称")
    private String deptName;

    @ApiModelProperty(value = "病人信息")
    private PatArchive patArchive;