合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs

@@ -49,7 +49,7 @@
        /// </summary>

        private void InitFrameTable()

        {

            if (this.m_frameTable != null)

            if (this.m_frameTable != null && this.m_frameTable.Parent != null)

            {

                return;

            }