From 319fdcaa2d7979b056b2801e11d08fe6ecdff126 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 22 Nov 2023 13:32:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
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