From fb89f40499211dae5d74caf3cea2ea696745e7a2 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:53:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java
index 70fefd6..7e443a3 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java
@@ -63,6 +63,9 @@
@ApiModelProperty(value = "������������")
private Integer isApprove;
+ @ApiModelProperty(value = "������������")
+ private String stateName;
+
public Integer getResidueDay() {
int day = this.changeDay;
if(AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(state)){
--
Gitblit v1.8.0