From 4f2a2b480f1d36782c315881bad50066a52e71aa Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 04 二月 2024 14:11:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 c6be2c9..09ba80d 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
@@ -635,8 +635,8 @@
AUDIT_UN_PASS(2, "娲鹃仯鍗曚綅涓嶉�氳繃"),
EDIT_UNIT(3, "淇敼娲鹃仯鍗曚綅淇℃伅"),
ADD_WORK_TYPE(4, "鎻愪氦娣诲姞宸ョ"),
- WORK_TYPE_AUDIT_PASS(5, "娣诲姞宸ョ瀹℃壒閫氳繃"),
- WORK_TYPE_AUDIT_UN_PASS(6, "娣诲姞宸ョ瀹℃壒涓嶉�氳繃"),
+ WORK_TYPE_AUDIT_PASS(5, "娣诲姞宸ョ瀹℃牳閫氳繃"),
+ WORK_TYPE_AUDIT_UN_PASS(6, "娣诲姞宸ョ瀹℃牳涓嶉�氳繃"),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -678,7 +678,7 @@
}
public enum ApplyCollectStatus {
- DSP(0, "寰呭鎵�"),
+ DSP(0, "寰呭鏍�"),
DCD(1, "寰呭嚭鍗�"),
BZZ(2, "淇濋殰涓�"),
YGQ(3, "宸茶繃鏈�"),
@@ -822,7 +822,7 @@
COMPANY_BACK_APPLY_WAIT_SIGNATURE(7, "浼佷笟鐢宠閫�鍥�(寰呯绔�)","鎻愪氦鎰忚锛�${param}",5),
COMPANY_BACK_APPLY_SIGNATURE(8, "浼佷笟鐢宠閫�鍥�(宸茬绔�)","鎻愪氦鎰忚锛�${param}",5),
CLOSE(9, "璁㈠崟鍏抽棴","",6),
- PLATFORM_CHECK_PASS(10,"骞冲彴鎶曚繚瀹℃牳閫氳繃","鎻愪氦鎰忚锛�${param}",1),
+ PLATFORM_CHECK_PASS(10,"骞冲彴鎶曚繚瀹℃牳閫氳繃","鎻愪氦鎰忚锛�${param}",0),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -972,9 +972,9 @@
public enum NoticeType {
- ZERO(0, "寰呭鎵�","","","寰呭鏍�","宸茬敵璇�","寰呭彈鐞�"),
+ ZERO(0, "寰呭鏍�","","","寰呭鏍�","宸茬敵璇�","寰呭彈鐞�"),
ONE(1, "浼佷笟寰呯缃�","","","宸ョ寰呭鏍�","","瀹屾垚鍙楃悊"),
- TWO(2, "寰呭嚭鍗�","寰呭鎵�","寰呭鎵�","","",""),
+ TWO(2, "寰呭嚭鍗�","寰呭鏍�","寰呭鏍�","","",""),
THREE(3, "鐢宠閫�鍥�","鐢宠閫�鍥�","鐢宠閫�鍥�","","",""),
FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","",""),
FIVE(5, "鐢宠椹冲洖","鐢宠椹冲洖","鐢宠椹冲洖","","","")
@@ -1107,7 +1107,7 @@
public enum ApplyChangeStatus {
UPLOAD(0, "鎻愪氦鍔犲噺淇�/鎹㈠巶鐢宠"),
SIGNATURE(1, "宸茬绔�"),
- APPROVE(2, "宸蹭笂浼犲鎵�"),
+ APPROVE(2, "宸蹭笂浼犲鏍�"),
RETURN_APPLY_UPLOAD(3, "鍙戣捣閫�鍥炵敵璇�(寰呭鏍�)"),
RETURN_APPLY_SIGNATURE(4, "鍙戣捣閫�鍥炵敵璇凤紙宸茬绔狅級"),
PLATFORM_AGREE(5, "骞冲彴鍚屾剰锛堝凡閫�鍥烇級"),
@@ -1277,8 +1277,8 @@
public enum ApplyChangeLogStatus {
UPLOAD(0, "鍙戣捣鐢宠",""),
RETURN_APPLY(3, "鍙戣捣閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}"),
- PLATFORM_AGREE(4, "骞冲彴瀹℃壒閫氳繃" ,"鎻愪氦鎰忚锛�${param}"),
- PLATFORM_UN_AGREE(0, "瀹℃壒椹冲洖","鎻愪氦鎰忚锛�${param}"),
+ PLATFORM_AGREE(4, "骞冲彴瀹℃牳閫氳繃" ,"鎻愪氦鎰忚锛�${param}"),
+ PLATFORM_UN_AGREE(0, "瀹℃牳椹冲洖","鎻愪氦鎰忚锛�${param}"),
CLOSE(5, "鍏抽棴",""),
;
// 鎴愬憳鍙橀噺
--
Gitblit v1.9.3