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

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs

@@ -75,7 +75,6 @@
                    }

                    //密码错误，请重新输入

                    pswControl.SetErrorMsg(Language.StringByID(R.MyInternationalizationString.uOldPsswordIsError));

                    pswControl.ResetControlInfo(i_PasswordText, false);

                    return;

                }

                //重置剩余密码次数