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

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

 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>