From c1107fe385312f9a7b1d9d84c06aaf54e01440fa Mon Sep 17 00:00:00 2001
From: cmg <527198563@qq.com>
Date: 星期二, 14 五月 2024 15:27:12 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-stander

---
 crm-platform-feign/src/main/java/com/hz/crm/dto/phis/PhisAppealTypeRelateDto.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/crm-platform-feign/src/main/java/com/hz/crm/dto/phis/PhisAppealTypeRelateDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/phis/PhisAppealTypeRelateDto.java
index 1953480..848896d 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/dto/phis/PhisAppealTypeRelateDto.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/phis/PhisAppealTypeRelateDto.java
@@ -1,9 +1,11 @@
 package com.hz.crm.dto.phis;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
 import com.gitee.sunchenbin.mybatis.actable.annotation.Index;
 import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 import java.util.List;
@@ -19,6 +21,8 @@
     /** ID */
     private String id;
     /** 鍒涘缓鏃堕棿 */
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
     /** 鏄惁鍒犻櫎 */
     private Integer isDel = 0;

--
Gitblit v1.8.0