Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/UserCenter/UserMain/SecondAuthenticationForm.cs

@@ -415,10 +415,8 @@
                        UserCenterResourse.HideOption.CenterHideMenu = 1;

                    }

                }

                if (textValue == "0001a")

                if (textValue == "1")

                {

                    var form = new Guide.GuideHouseForm();

                    form.ShowFrom();

                }

                if (textValue == "12349")

                {