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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/Device/CommonForm/SelectZone.cs

@@ -89,7 +89,7 @@
                roomList.Add(room.Name);
                roomIdList.Add(room.Id);
            }
           

        }

        /// <summary>