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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneSimpleSelectControl.cs

@@ -84,7 +84,7 @@


            //图标

            var btnIcon = this.AddLeftIcon();

            btnIcon.UnSelectedImagePath = "Item/Scene.png";

            btnIcon.UnSelectedImagePath = "Scene/SceneIcon.png";



            //场景

            var btnScene = this.AddLeftCaption(SceneTemp.Name, 850, 60);