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

rk

5 天以前 28d2b0a2b33c786670f4999e4b634036de2d6883

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java

@@ -107,6 +107,9 @@
    @ExcelColumn(name="公司/组织",index = 4,width = 16)
    private String personCompanyName;

    @ApiModelProperty(value = "组织类型：0=相关方；1=内部")
    private String companyType;

    @ApiModelProperty(value = "手机号")
    @ExcelColumn(name="手机号",index = 3,width = 10)
    private String personPhone;