Merge remote-tracking branch 'origin/master'

lishuai

2023-12-15 3a86c9c6879971051ab1e01a5b9b88eed27e55db

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

@@ -188,7 +188,7 @@
    @ApiModelProperty(value = "白名单单号")
    @ExcelColumn(name="白名单单号")
    @TableField("ext_event_white_list_no")
    private String extEventWhiteListNo;
    private Integer  extEventWhiteListNo;

    @ApiModelProperty(value = "事件上报驱动的时间")
    @ExcelColumn(name="事件上报驱动的时间")