From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java |    6 +++++-
 1 files changed, 5 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 ad7718b..817af9c 100644
--- a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
+++ b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
@@ -53,7 +53,11 @@
     MONITOR_POINT_IS_EXIST(-39,"���������������"),
     MONITOR_POINT_IS_NOT_EXIST(-40,"���������������"),
     VERSION_NOT_EXIST(-41,"���������������"),
-    VERSION_EXIST(-42,"������������������")
+    VERSION_EXIST(-42,"������������������"),
+    MAC_IS_EXIST(-42,"mac���������"),
+    URL_IS_EXIST(-43,"���������������"),
+    ORGANIZATION_EXIST_MONITORPOINT(-44,"���������������������������������"),
+    CHILDREN_ORGANIZATION_EXIST_MONITORPOINT(-45,"������������������������������������")
     ;
     private final Integer code;
     private final String  msg;

--
Gitblit v1.8.0