From be0301e67768fb183df7e29f411a7e54dbf15c40 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 08 五月 2024 10:37:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 ada5761..b23f984 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
@@ -707,7 +707,7 @@
}
public enum ApplyCollectStatus {
- DSP(0, "寰呭鎵�"),
+ DSP(0, "寰呭鏍�"),
DCD(1, "寰呭嚭鍗�"),
BZZ(2, "淇濋殰涓�"),
YGQ(3, "宸茶繃鏈�"),
@@ -721,7 +721,8 @@
WTBDCD(23, "寰呭嚭鍗�"),
WTBYTH(24, "宸查��鍥�"),
WTBYGB(25, "宸插叧闂�"),
- WTBTBZ(26, "鎶曚繚涓�"),
+ //2024骞�4鏈�25鏃�15:17:13 淇敼 鎶曚繚涓� = 銆� 鎵规敼鐢宠涓�
+ WTBTBZ(26, "鎵规敼鐢宠涓�"),
WTBBZZ(27, "淇濋殰涓�"),
;
// 鎴愬憳鍙橀噺
@@ -1235,9 +1236,9 @@
public enum NoticeType {
- ZERO(0, "寰呭鎵�","","","寰呭鏍�","寰呭鐞�","澶勭悊涓�"),
+ ZERO(0, "寰呭鏍�","","","寰呭鏍�","寰呭鐞�","澶勭悊涓�"),
ONE(1, "浼佷笟寰呯缃�","","","宸ョ寰呭鏍�","","宸茬粨妗�"),
- TWO(2, "寰呭嚭鍗�","寰呭鎵�","寰呭鎵�","","",""),
+ TWO(2, "寰呭嚭鍗�","寰呭鏍�","寰呭鏍�","","",""),
THREE(3, "鐢宠閫�鍥�","鐢宠閫�鍥�","鐢宠閫�鍥�","","",""),
FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","","宸叉挙閿�"),
FIVE(5, "鐢宠椹冲洖","鐢宠椹冲洖","鐢宠椹冲洖","","",""),
--
Gitblit v1.9.3