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/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