From d8a01a15bf6f310734a18eb7740c7f5ef2d19736 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 27 Oct 2023 10:08:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa

---
 screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java b/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java
index ec7aec1..3b4b5d2 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.moral.api.entity.Allocation;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -23,4 +24,7 @@
     private Integer applyState;
 
     private Integer isApprove;
+
+    @ApiModelProperty(value = "������������")
+    private String stateName;
 }

--
Gitblit v1.8.0