From 5eb88939c094fac1f5dc9201b5af6da4165cc185 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 28 Sep 2023 10:36:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/pojo/vo/allocationextension/AllocationExtensionPageVo.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/allocationextension/AllocationExtensionPageVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/allocationextension/AllocationExtensionPageVo.java
index 1747e09..f9915bc 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/allocationextension/AllocationExtensionPageVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/allocationextension/AllocationExtensionPageVo.java
@@ -1,5 +1,6 @@
package com.moral.api.pojo.vo.allocationextension;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.moral.api.pojo.ext.allocationextension.AllocationExtensionPageExt;
import com.moral.api.utils.BeanConverts;
import io.swagger.annotations.ApiModel;
@@ -35,6 +36,7 @@
private String allocationNum;
@ApiModelProperty(value = "������������")
+ @JsonFormat(pattern="yyyy-MM-dd")
private Date escalationTime;
@ApiModelProperty(value = "������������id")
private Integer unitId;
@@ -68,6 +70,7 @@
private String createName;
@ApiModelProperty(value = "������������")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date createTime;
@ApiModelProperty(value = "���������id")
@@ -77,6 +80,7 @@
private String updateName;
@ApiModelProperty(value = "������������")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date updateTime;
--
Gitblit v1.8.0