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 |    2 +-
 1 files changed, 1 insertions(+), 1 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 10946d3..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
@@ -26,7 +26,7 @@
     /**
      *������
      */
-    NEW_BUILT(10, "������"),
+//    NEW_BUILT(10, "������"),
     /**
      *���������
      */

--
Gitblit v1.8.0