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

jinpengyong

2021-06-23 6f12948893fcc846dfb32aa861c473a842edcd56

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

@@ -47,4 +47,15 @@
    * 接收类型：Map<String,Device>
    * */
    public static final String DEVICE_INFO = "device_alarm_info";

    /*
     * 设备校准公式前缀
     * */
    public static final String ADJUST = "adjust";

    /*
     * 设备实时数据
     * */
    public static final String DEVICE_DATA = "data";

}