2021-02-05 1.编译冲突修改

JLChen

2021-02-05 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a

 HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs

@@ -71,7 +71,7 @@
            bodyView.AddChidren(topView);

            //不是A网关或者是成员 只允许添加场景隐藏自动化
            var HideAutoPage = DB_ResidenceData.Instance.GatewayType != 1 || DB_ResidenceData.Instance.CurrentRegion.IsOthreShare;
            var HideAutoPage = DB_ResidenceData.Instance.GatewayType != 1|| DB_ResidenceData.Instance.CurrentRegion.IsOthreShare;
            //判断是否需要隐藏自动化
            if (HideAutoPage)
            {