Merge branch 'master' into WJC

陈嘉乐

2020-12-04 dcb9b9b5561b4e6d1eaf1e602e8ae054e578ec6e

 HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs

@@ -30,7 +30,7 @@
                    }
                    if (room != null)
                    {
                        if (!updataFunction.roomIds.Contains(room.sid))
                        if (!updataFunction.roomIds.Contains(room.uid))
                        {
                            return;
                        }