Merge remote-tracking branch 'origin/wxr4' into dev-tzy

tzy

2021-06-09 884b594a7171a496609299c9c535e04c32316bb8

 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;

            }