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

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

 ZigbeeApp/Shared/Phone/UserCenter/Safety/PasswordAddNewForm.cs

@@ -68,8 +68,6 @@
                    string msg = this.CheckPassword(firstPsw, pssword);

                    if (msg != string.Empty)

                    {

                        //请重复输入新安防密码

                        pswControl.ResetControlInfo(Language.StringByID(R.MyInternationalizationString.uPleaseRepeatInputNewSafetyPassword));

                        //设置错误信息

                        pswControl.SetErrorMsg(msg);

                        return;