From b847c06d8617efb2cbbad6f11b0344b779138e92 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 14 十月 2024 18:03:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into feature/v2.7_迭代
---
HDL_ON/Entity/DB_ResidenceData.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 219fe33..5786b46 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -74,7 +74,7 @@
ShowFunction.FreshAir,ShowFunction.DoorLock,
ShowFunction.Panel,
ShowFunction.Sensor,ShowFunction.VideoIntercom,
- ShowFunction.SecurityCenter,ShowFunction.Acst,
+ ShowFunction.SecurityCenter,ShowFunction.Acst,ShowFunction.InverterJinmao,
ShowFunction.MechanicalArm ,
ShowFunction.SecurityMonitoring,
ShowFunction.VideoDoorLock,
@@ -159,7 +159,7 @@
FunctionList.List.ClearDatas();
///鍒囨崲浣忓畢娓呯┖鍓嶄綇瀹呯紦瀛樿嚜鍔ㄥ寲鍒楄〃锛�
- HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
+ UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
#if IOS
--
Gitblit v1.8.0