From b7feda7c2cc54e03966ecbd2ed2582097eb3ee73 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 23 May 2022 08:24:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

---
 src/main/java/org/springblade/modules/ownerFeed/entity/Owner.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/ownerFeed/entity/Owner.java b/src/main/java/org/springblade/modules/ownerFeed/entity/Owner.java
index e0beac5..8ab7b4b 100644
--- a/src/main/java/org/springblade/modules/ownerFeed/entity/Owner.java
+++ b/src/main/java/org/springblade/modules/ownerFeed/entity/Owner.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.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 实体类
@@ -62,7 +65,9 @@
 	 */
 	@ApiModelProperty(value = "反馈时间")
 	@TableField("feedback_time")
-	private String feedbackTime;
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date feedbackTime;
 
 	/**
 	 * 反馈意见

--
Gitblit v1.9.3