From 43e5052b91f0568ccbcf3fd6df70cf8209db184a Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 28 May 2021 17:36:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java |    3 ++-
 1 files changed, 2 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..02dd276 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,8 @@
     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���������")
     ;
     private final Integer code;
     private final String  msg;

--
Gitblit v1.8.0