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

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

 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);