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

doum

15 小时以前 92d9a112e492720ee610fbb46e1ed1d6f0a86fee

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java

@@ -72,6 +72,12 @@
    @ExcelColumn(name="所在位置",width=10,index = 5)
    private String region;

    @ApiModelProperty(value = "位置主键")
    private String regionId;

    @ApiModelProperty(value = "设备主键")
    private String deviceId;

    @ApiModelProperty(value = "唯一标识")
    //@ExcelColumn(name="唯一标识")
    private String eventId;