From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

---
 src/main/java/com/moral/common/bean/Constants.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/common/bean/Constants.java b/src/main/java/com/moral/common/bean/Constants.java
index 644f7d0..eb934f2 100644
--- a/src/main/java/com/moral/common/bean/Constants.java
+++ b/src/main/java/com/moral/common/bean/Constants.java
@@ -58,5 +58,6 @@
 	public static final String DEVICE_STATE_MIDDLE ="2";
 	public static final String DEVICE_STATE_SERIOUS ="3";
 	public static final String DEVICE_STATE_OFFLINE ="4";
+	public static final String DEVICE_STATE_MAINTENANCE ="9";
 }
 

--
Gitblit v1.8.0