Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-07-13 91a88471d84246524548a318aec1f22735cfedc9

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

@@ -122,7 +122,7 @@
    /*
     * 离线设备状态码
     * */
    public static final String DEVICE_STATE_OFFLINE = "4";
    public static final String DEVICE_STATE_OFFLINE = "0";

    /*
     * 臭氧code