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

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs

@@ -140,7 +140,7 @@
            bottomFrameLayout.AddChidren(btnFinifh);
            #endregion

            #region 数据处理  
            #region 数据处理
            //获取楼层
            dicFloor = Common.Room.CurrentRoom.GetFloorSortList();
            currentKey.currentSelectFloorId = BindInfo.GetCurrentSelectFloorId();