From a6d6627a6e13aef60941337a270541f507d53ba7 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 15 十二月 2023 09:36:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/DeviceEventQuery.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/DeviceEventQuery.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/DeviceEventQuery.java
index 92c86c5..46d1ac2 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/DeviceEventQuery.java
+++ b/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;
}
--
Gitblit v1.9.3