代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

 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>