From f86b4032c5824c4e69821ce9b795e8a7c236c799 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 27 Oct 2023 08:56:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java
index 3264fd6..7aede07 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java
@@ -96,6 +96,8 @@
@ApiModelProperty(value = "������������������")
private Integer applyState;
+ @ApiModelProperty(value = "������������")
+ private Integer isApprove;
public static AllocationPageVo convert(AllocationPageExt allocationPageExt) {
AllocationPageVo allocationPageVo = BeanConverts.convert(allocationPageExt, AllocationPageVo.class);
--
Gitblit v1.8.0