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

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

 ZigbeeApp/Shared/Phone/UserCenter/DeviceShard/ShardConfigureDeviceListForm.cs

@@ -42,6 +42,9 @@
        /// </summary>
        private void InitMiddleFrame()
        {
            //清空bodyFrame

            this.ClearBodyFrame();



            //输出回路列表
            var btnText = new TitleViewControl();

            btnText.Y = Application.GetRealHeight(40);