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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs

@@ -64,7 +64,7 @@
                frameCode.X = i * Application.GetRealWidth(115 + 49);

                frameCode.Width = Application.GetRealWidth(115);

                frameCode.Height = Application.GetRealHeight(104);

                frameCode.Radius = 6;

                frameCode.Radius = (uint)Application.GetRealHeight(17);

                frameCode.BorderWidth = 1;

                frameCode.BorderColor = UserCenterColor.Current.TextFrameColor;

                this.AddChidren(frameCode);