From 41c983292fdd3a4291245940cecb462b839a9e62 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期五, 08 三月 2024 08:52:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/RetentionQuery.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/RetentionQuery.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/RetentionQuery.java
index 6aa798f..24d4212 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/RetentionQuery.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/RetentionQuery.java
@@ -1,5 +1,6 @@
package com.doumee.dao.admin.request;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,8 +24,8 @@
private String type;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
- private String startTime;
+ private Date startTime;
@ApiModelProperty(value = "缁撴潫鏃堕棿")
- private String endTime;
+ private Date endTime;
}
--
Gitblit v1.9.3