From 6f12948893fcc846dfb32aa861c473a842edcd56 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Jun 2021 14:46:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_

---
 screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java |    5 ++++-
 1 files changed, 4 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 817af9c..cf8b71c 100644
--- a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
+++ b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
@@ -57,7 +57,10 @@
     MAC_IS_EXIST(-42,"mac���������"),
     URL_IS_EXIST(-43,"���������������"),
     ORGANIZATION_EXIST_MONITORPOINT(-44,"���������������������������������"),
-    CHILDREN_ORGANIZATION_EXIST_MONITORPOINT(-45,"������������������������������������")
+    CHILDREN_ORGANIZATION_EXIST_MONITORPOINT(-45,"������������������������������������"),
+    DEVICE_IS_NULL(-46, "���������������"),
+    TARGET_IS_NULL(-47, "���������������������"),
+    VERSION_USED(-48,"������������������������������")
     ;
     private final Integer code;
     private final String  msg;

--
Gitblit v1.8.0