Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewEmailForm.cs

@@ -65,6 +65,8 @@
            btnLine.Y = txtValue.Bottom;

            btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;

            frame.AddChidren(btnLine);

            //联动线的状态

            txtValue.btnLine = btnLine;



            if (string.IsNullOrEmpty(UserCenterResourse.UserInfo.Email) == false)

            {