Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs

@@ -245,7 +245,7 @@
            {

                menuCount = 2;

            }

            var frame = new TopRightMenuControl(menuCount);

            var frame = new TopRightMenuControl(this, menuCount);

            if (canTest == true)

            {

                //定位