合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameCaptionInputControl.cs

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

        public string Text

        {

            get { return txtInput.Text; }

            get { return txtInput.Text.Trim(); }

            set { txtInput.Text = value; }

        }

        /// <summary>