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/AtmoFunctionCode.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/AtmoFunctionCode.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/AtmoFunctionCode.java
index 79377f7..9dfc3bb 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/AtmoFunctionCode.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/AtmoFunctionCode.java
@@ -19,8 +19,8 @@
     Reboot("10"),
     //  璁剧疆蹇冭烦鍖呴棿闅�
     SettingHeartBeatTime("11"),
-    //璁剧疆鍦板潃
-    SettingAddress("12"),
+//    //璁剧疆鍦板潃
+//    SettingAddress("12"),
     //浼犳劅鍣ㄥ姛鑳藉紑鍏�
     SensorSwitch("13"),
     //璁剧疆鏁版嵁淇鍊�-娓╁害

--
Gitblit v1.9.3