代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs

@@ -113,7 +113,7 @@
            dic = dicMsg[keys];

            //验证码错误

            dic["ValidCodeAndPhoneNoEqual"] = R.MyInternationalizationString.ValidatorCode_ValidCodeAndPhoneNoEqual;

            //未发送验证码到此账号

            //验证码已失效

            dic["NoRecord"] = R.MyInternationalizationString.ValidatorCode_NoRecord;



            //绑定或者更换主账号

@@ -499,6 +499,8 @@
            dic["Fail"] = R.MyInternationalizationString.uOperationFailed;

            //账号不存在

            dic["AccountNoExists"] = R.MyInternationalizationString.uAccountNoExists;

            //原密码和新密码相同

            dic["NewPasswordAndOldPasswordEqual"] = R.MyInternationalizationString.UpdatePassword_NewPasswordAndOldPasswordEqual;



            //更新用户头相

            keys = "ZigbeeUsers/UpdateHeadImage";