Merge branch 'dev-tzy' into wxr6

wxr

2021-06-09 5bfb959c47017825c8cf7dc8570c55b04dab694c

 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;

            }