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

gxc

2020-01-10 c0021397eeb8335d6d1f20990c71533c3d94e7af

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

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

                    if (msg != string.Empty)

                    {

                        //请重复输入新胁迫密码

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

                        //设置错误信息

                        pswControl.SetErrorMsg(msg);

                        return;