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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs

@@ -149,7 +149,7 @@
            if (resultValue == null)

            {

                //出现未知错误,数据丢失

                string msg = Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost);

                string msg = Language.StringByID(R.MyInternationalizationString.uUnKnownError);

                this.ShowMassage(ShowMsgType.Tip, msg);

                return;

            }

@@ -166,7 +166,7 @@
            if (memberInfoRes == null)

            {

                //出现未知错误,数据丢失

                string msg = Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost);

                string msg = Language.StringByID(R.MyInternationalizationString.uUnKnownError);

                this.ShowMassage(ShowMsgType.Tip, msg);

                return;

            }