From fb759782181908c9d91054ad1da9c039b8fb0dab Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 28 Sep 2023 17:00:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/pojo/vo/allocationextension/AllocationExtensionPageVo.java | 3 ++-
1 files changed, 2 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 f9915bc..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
@@ -83,7 +83,8 @@
@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