From f26786e162241b6b803ada6d19d80e1f5fb615e5 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 16 Oct 2023 09:36:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 screen-api/src/main/java/com/moral/api/pojo/enums/AllocationApproveEnum.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/pojo/enums/AllocationApproveEnum.java b/screen-api/src/main/java/com/moral/api/pojo/enums/AllocationApproveEnum.java
index 24d3383..201410f 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/enums/AllocationApproveEnum.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/enums/AllocationApproveEnum.java
@@ -20,13 +20,21 @@
 @JsonFormat(shape = JsonFormat.Shape.OBJECT)
 public enum AllocationApproveEnum implements IntegerValueEnum{
     /**
+     *������
+     */
+    DRAFT(9, "������"),
+    /**
      *������
      */
-    NEW_BUILT(10, "������"),
+//    NEW_BUILT(10, "������"),
     /**
      *���������
      */
-    UNDER_RECTIFICATION(20, "���������"),
+   // CHANGE(19, "������"),
+    /**
+     *���������
+     */
+    UNDER_RECTIFICATION(20, "������"),
     /**
      *���������
      */

--
Gitblit v1.8.0