From 5bfb959c47017825c8cf7dc8570c55b04dab694c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 16:42:11 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into wxr6

---
 HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs b/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
index f67503e..ccceeed 100644
--- a/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
+++ b/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
@@ -313,7 +313,7 @@
             topFrameLayout.AddChidren(btnSetting);
 
             //濡傛灉鏄垚鍛樻病鏈夊姛鑳�
-            if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == true)
+            if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == true)
             {
                 btnSetting.Visible = false;
             }

--
Gitblit v1.8.0