Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

 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";
}