Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2021-06-23 6f12948893fcc846dfb32aa861c473a842edcd56

 screen-common/src/main/java/com/moral/constant/Constants.java

@@ -120,5 +120,10 @@
     * */
    public static final String UN_ADJUST = "unadjust";

    /*
     * 离线设备状态码
     * */
    public static final String DEVICE_STATE_OFFLINE = "4";


}