From f415ad31e5335837007f02d68b7aa1c2f2307235 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 13 Oct 2023 13:03:21 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 screen-api/src/main/java/com/moral/api/pojo/vo/approvetable/ApproveTableListVo.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/approvetable/ApproveTableListVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/approvetable/ApproveTableListVo.java
index c1ebf31..1317d7e 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/approvetable/ApproveTableListVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/approvetable/ApproveTableListVo.java
@@ -1,5 +1,6 @@
 package com.moral.api.pojo.vo.approvetable;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -40,6 +41,7 @@
     private String createName;
 
     @ApiModelProperty(value = "������������")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
 
 }

--
Gitblit v1.8.0