From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001 From: lin <sbla5888@163.com> Date: Thu, 14 Mar 2024 18:15:29 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/org/springblade/modules/task/vo/TaskVO.java | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/src/main/java/org/springblade/modules/task/vo/TaskVO.java b/src/main/java/org/springblade/modules/task/vo/TaskVO.java index dd6dd24..0354311 100644 --- a/src/main/java/org/springblade/modules/task/vo/TaskVO.java +++ b/src/main/java/org/springblade/modules/task/vo/TaskVO.java @@ -16,10 +16,14 @@ */ package org.springblade.modules.task.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.modules.task.entity.TaskEntity; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * 任务表 视图实体类 @@ -70,4 +74,17 @@ private String frontType; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date startTimes; + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date reachTime; + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date returnTime; + + } -- Gitblit v1.9.3