From a4d06b1354d48d94c8e07d716863bcb7d3876a07 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Jun 2021 15:18:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_

---
 screen-common/src/main/java/com/moral/constant/RedisConstants.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/screen-common/src/main/java/com/moral/constant/RedisConstants.java b/screen-common/src/main/java/com/moral/constant/RedisConstants.java
index dd34339..bbc6324 100644
--- a/screen-common/src/main/java/com/moral/constant/RedisConstants.java
+++ b/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";
+
 }

--
Gitblit v1.8.0