From ac6261ea96f8b32cd6f1ae52d6dc77700af77ce9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 25 Oct 2023 14:31:12 +0800
Subject: [PATCH] chore:补充提交
---
screen-api/src/main/java/com/moral/api/pojo/vo/allocationextension/AllocationExtensionPageVo.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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..2eab93f 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,9 +80,11 @@
private String updateName;
@ApiModelProperty(value = "������������")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date updateTime;
-
+ @ApiModelProperty(value = "������������")
+ private Integer isApprove;
public static AllocationExtensionPageVo convert(AllocationExtensionPageExt allocationExtensionPageExt) {
AllocationExtensionPageVo allocationExtensionPageVo = BeanConverts.convert(allocationExtensionPageExt, AllocationExtensionPageVo.class);
--
Gitblit v1.8.0