From ea94079e74182be590b9fff356c97f522d9a7828 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期二, 18 十月 2022 09:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/A5LightDataEnum.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/A5LightDataEnum.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/A5LightDataEnum.java
index 571904d..2b25b7c 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/A5LightDataEnum.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/A5LightDataEnum.java
@@ -14,11 +14,16 @@
     //  鍏夋劅鎺у埗
     LightSensorControl("04"),
 
+
     //璁剧疆瀹氭椂鎺х伅鍙傛暟
     LightTimer("23"),
     // 娓呴櫎鍗曠伅绱鏁版嵁
     LightReset("25"),
-    LIGHT_HEART_BEAT("light_heart_beat/");
+    //鏁呴殰鐮佷笂鎶ユ竻闄�
+    LightCleanErrorCode("29"),
+    //璁剧疆鏃ュ巻锛堝悓蹇冭烦鍖呬腑鐨�6瀛楄妭鏃ユ湡鏃堕棿锛�
+    SetCalendar("28"),
+    LIGHT_HEART_BEAT("LightReportData:light_heart_beat/");
 
     A5LightDataEnum(String code) {
         this.code = code;

--
Gitblit v1.9.3