From 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 25 Mar 2021 17:24:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
index fe69c7a..26c9480 100644
--- a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
+++ b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
@@ -30,7 +30,13 @@
ORGANIZATION_PARENT_NOT_EXIST(-16,"������������������"),
PHONE_INVALID(-17,"���������������"),
TIME_FORMAT_INVALID(-18,"������������������"),
- TIME_INVALID(-19,"������������")
+ TIME_INVALID(-19,"������������"),
+ GROUP_EXIST(-20, "������������"),
+ ROLE_IS_EXPIRE(-21, "���������������"),
+ ROLE_IS_NULL(-22, "������������"),
+ MENU_IS_EXPIRE(-23, "���������������"),
+ MENU_IS_NULL(-24, "������������"),
+ PARAMETERS_NOT_REQUIREMENT(-25, "���������������������")
;
private final Integer code;
private final String msg;
--
Gitblit v1.8.0