From 652fca264c2468782a2d5a4fbe21a13df448b91a Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Mon, 22 Aug 2022 15:50:39 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java
index ff48425..8eb952c 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java
@@ -44,9 +44,31 @@
DRILL_EXECUTE_NULL("D1004" , "应急演练实施不可为空"),
- DRILL_EVALUATION_NOT_EXIST("D1004" , "应急演练实施评价不存在"),
+ DRILL_EVALUATION_NOT_EXIST("D1005" , "应急演练实施评价不存在"),
- DRILL_EVALUATION_NULL("D1005" , "应急演练实施评价不可为空"),
+ DRILL_EVALUATION_NULL("D1006" , "应急演练实施评价不可为空"),
+
+ SUPPLIES_NULL("S1001" , "应急物资不可为空"),
+
+ SUPPLIES_NOT_EXIST("S1002" , "应急物资不存在"),
+
+ SUPPLIES_INSPECT_NULL("S1003" , "应急物资检查不可为空"),
+
+ SUPPLIES_INSPECT_NOT_EXIST("S1004" , "应急物资检查不存在"),
+
+ SUPPLIES_MAINTAIN_NULL("S1005" , "应急物资保养不可为空"),
+
+ SUPPLIES_MAINTAIN_NOT_EXIST("S1006" , "应急物资保养不存在"),
+
+ APPROVE_RELATE_ID_NULL("A1001","审批业务类型不可为空"),
+
+ APPROVE_RELATE_TYPE_NULL("A1002","审批业务对象不可为空"),
+
+ APPROVE_PERSON_NULL("A1003","审批人不可为空"),
+
+ APPROVE_STATUS_NULL("A1004","审批状态不可为空"),
+
+ APPROVE_NOT_EXIST("A1005" , "审批记录不存在"),
ERROR("A3000", "未知错误");
--
Gitblit v1.9.2