From b762ec2dd9db7ebcf222b0621cd3c1671f9f451c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 22 Jun 2021 17:47:02 +0800
Subject: [PATCH] 版本合并
---
src/main/java/org/springblade/modules/feedback/entity/Feedback.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/feedback/entity/Feedback.java b/src/main/java/org/springblade/modules/feedback/entity/Feedback.java
index 2883d12..24febeb 100644
--- a/src/main/java/org/springblade/modules/feedback/entity/Feedback.java
+++ b/src/main/java/org/springblade/modules/feedback/entity/Feedback.java
@@ -20,11 +20,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.util.Date;
/**
* 实体类
@@ -106,7 +109,9 @@
*/
@ApiModelProperty(value = "事发时间")
@TableField("stime")
- private String stime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date stime;
/**
* 处理完成时间
*/
--
Gitblit v1.9.3