Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

@@ -79,7 +79,7 @@
            var room = HdlRoomLogic.Current.GetRoomBySceneId(this.SceneId);

            if (room != null)

            {

                btnRoom.Text = room.Name;

                btnRoom.Text = HdlRoomLogic.Current.GetRoomName(room);

            }

            else

            {