From e1c072109e62f4adcb53af0d2c69b896b9159059 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 29 五月 2025 18:21:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 server/service/src/main/java/com/doumee/core/utils/Constants.java |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index 9ce9883..00e3625 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -1691,15 +1691,17 @@
 
     public  enum NoticeType {
 
-        ZERO(0, "寰呭鏍�","","","寰呭鏍�","寰呭鐞�","寰呭鏍�","寰呯缃�","寰呯缃�"),
-        ONE(1, "浼佷笟寰呯缃�","","","宸ョ寰呭鏍�","","宸查��鍥�","",""),
-        TWO(2, "寰呭嚭鍗�","寰呭鏍�","寰呭鏍�","","","寰呭彈鐞�","",""),
+        ZERO(0, "寰呭鏍�","","","寰呭鏍�","寰呭鐞�","椋庨櫓妗堜欢寰呭鏍�","寰呯缃�","寰呯缃�"),
+        //鐞嗚禂閫氱煡浼佷笟锛堥潪寰呭姙锛�
+        ONE(1, "浼佷笟寰呯缃�","","","宸ョ寰呭鏍�","","椋庨櫓妗堜欢绔嬫閫�鍥�","",""),
+        TWO(2, "寰呭嚭鍗�","寰呭鏍�","寰呭鏍�","","","宸茬珛妗堝緟鍙楃悊","",""),
         THREE(3, "鐢宠閫�鍥�","鐢宠閫�鍥�","鐢宠閫�鍥�","","","宸插彈鐞嗭紝闇�瑕佽ˉ鍏呮潗鏂�","",""),
-        FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","","宸叉嫆缁�","",""),
+        //鐞嗚禂閫氱煡浼佷笟锛堥潪寰呭姙锛�
+        FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","","宸叉嫆缁濆彈鐞�","",""),
         FIVE(5, "鐢宠椹冲洖","鐢宠椹冲洖","鐢宠椹冲洖","","","鍟嗚寰呴瀵煎鎵�","",""),
         //缁繚閫氱煡
         SIX(6, "","","","","","鍟嗚瀹℃壒鎷掔粷","",""),
-        //鍟嗘埛绔� 濮旀墭淇� - 鎶曚繚寰呭鏍� 鍔犲噺淇� 鎹㈠巶 寰呭鏍�
+        //鍟嗘埛绔� 濮旀墭淇� - 鎶曚繚寰呭鏍� 鍔犲噺淇� 鎹㈠巶 寰呭鏍�, 鐞嗚禂閫氱煡浼佷笟锛堥潪寰呭姙锛�
         SEVEN(7, "寰呭鏍�","寰呭鏍�","寰呭鏍�","","","鍟嗚瀹℃壒鎷掔粷閫氱煡","",""),
         //寰呭瀹�
         EIGHT(8, "寰呭鏍�","","","","","寰呯悊绠�","",""),
@@ -1707,8 +1709,18 @@
         TEN(10, "","","","","","寰呮牳璧旂‘璁�","",""),
         ELEVEN(11, "","","","","","璧斾粯閲戦宸插彉鏇�","",""),
         TWELVE(12, "","","","","","寰呯粨妗�","",""),
-        THIRTEEN(13, "","","","","","宸茬粨妗�","",""),
+        //鐞嗚禂閫氱煡骞冲彴锛堥潪浠e姙锛�
+        THIRTEEN(13, "","","","","","宸茬粨妗堬紝璧斾粯娆鹃」灏嗗湪1-3涓伐浣滄棩鍐呭埌璐�","",""),
+        //鐞嗚禂閫氱煡骞冲彴锛堥潪浠e姙锛�
         FOURTEEN(14, "","","","","","宸叉挙妗�","",""),
+        //鐞嗚禂閫氱煡浼佷笟锛堥潪寰呭姙锛�
+        FIFTEEN(15, "","","","","","宸插彈鐞嗗緟鐞嗙畻","",""),
+        //鐞嗚禂閫氱煡浼佷笟(闈炲緟鍔烇級
+        SIXTEEN(16, "","","","","","鍙楃悊瀹℃壒涓�","",""),
+        //鐞嗚禂閫氱煡浼佷笟(闈炲緟鍔烇級
+        SEVENTEEN(17, "","","","","","宸茬悊绠楀緟鏍歌禂","",""),
+        //鐞嗚禂閫氱煡浼佷笟(闈炲緟鍔烇級
+        EIGHTEEN(18, "","","","","","寰呯粨妗堬紝璧斾粯閲戦宸插彉鏇�","",""),
         ;
 
         // 鎴愬憳鍙橀噺

--
Gitblit v1.9.3