From 3be0abe90546f2a3a45828f5e6c8adc4517ea9e0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 14 一月 2022 13:12:38 +0800
Subject: [PATCH] Merge branch 'wxr1215'

---
 HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index 230d2f6..cc585e6 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -86,7 +86,7 @@
             //鍒ゆ柇鏄惁闇�瑕侀殣钘忚嚜鍔ㄥ寲
             if (HideAutoPage)
             {
-                if (false && DB_ResidenceData.Instance.GatewayType == 1)//缃戝叧闇�瑕佸姞杞藉畨闃�--2021-11-28 19:56:53  鍒樻檽杈夊皢瀹夐槻鏀惧叆鏀圭晫闈�
+                if (DB_ResidenceData.Instance.GatewayType == 1)//缃戝叧闇�瑕佸姞杞藉畨闃�--2021-11-28 19:56:53  鍒樻檽杈夊皢瀹夐槻鏀惧叆璇ョ晫闈�
                 {
                     btnSceneTilte  = new Button()
                     {
@@ -139,7 +139,7 @@
             }
             else
             {
-                if (false && DB_ResidenceData.Instance.GatewayType == 1)//缃戝叧闇�瑕佸姞杞藉畨闃�--2021-11-28 19:56:53  鍒樻檽杈夊皢瀹夐槻鏀惧叆鏀圭晫闈�
+                if (DB_ResidenceData.Instance.GatewayType == 1)
                 {
                     btnAutomationTitle = new Button()
                     {

--
Gitblit v1.8.0