合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs

@@ -213,7 +213,7 @@
            //{

            //    menuCount = 2;

            //}

            var frame = new TopRightMenuControl(menuCount);

            var frame = new TopRightMenuControl(menuCount, 1);

            if (canTest == true)

            {

                //定位