Merge remote-tracking branch 'origin/master'

jiangping

2023-12-15 b111c48e3c4608c82ddaaa9c5c976674a1faa3d9

 server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/DeviceEventQuery.java

@@ -27,9 +27,9 @@
    private String eventType;

    @ApiModelProperty(value = "开始时间")
    private String startTime;
    private Date startTime;

    @ApiModelProperty(value = "结束时间")
    private String endTime;
    private Date endTime;

}