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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

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

@@ -86,6 +86,7 @@
            btnPassword.TextSize = 24;

            btnPassword.TextColor = 0xfffc744b;

            btnPassword.Text = i_password;

            btnPassword.IsBold = true;

            frameback.AddChidren(btnPassword);



            //初始化列表控件