From 9a4629512ccf8359efd88671c9317c3cc7faf0c8 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期一, 29 八月 2022 16:46:40 +0800
Subject: [PATCH] Merge branch 'dev' into dev-temp

---
 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
index 4be6deb..e747af7 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -331,7 +331,7 @@
                 {
                     if (conditionsIndex == -1)
                     {
-                        var alert = new ShowMsgControl(ShowMsgType.Normal,
+                        var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
                    Language.StringByID(MyInternationalizationString.usertip),
                    Language.StringByID(MyInternationalizationString.confrim));
                         alert.Show();

--
Gitblit v1.8.0