Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

2 天以前 cff9aa6a3a5d9dab0c97cf9154382d1a69aa1cf5

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/RetentionVo.java

@@ -18,7 +18,8 @@
    @TableField(exist = false)
    public String companyName;

    @ApiModelProperty(value = "类型 0劳务访客 1普通访客 2内部员工")

    @ApiModelProperty(value = "类型 0相关方组织 1内部人员 2访客")
    @ExcelColumn(name="类型")
    private String typeName;