合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs

@@ -162,13 +162,13 @@
        /// <summary>

        /// 画面关闭

        /// </summary>
        public override void CloseForm()
        public override void CloseFormBefore()
        {

            this.m_parameter = null;

            //清空bodyFrame
            this.ClearBodyFrame();


            base.CloseForm();
            base.CloseFormBefore();
        }


        #endregion