Merge branch 'master' into WJC

陈嘉乐

2020-12-01 4a5e9d0447aae9b264a98ea1f4c95417d0f4aa91

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

@@ -288,7 +288,7 @@
                            var showList = new List<Function>();
                            foreach (var sf in functionList)
                            {
                                if(sf.roomIdList.Contains(tempRoom.sid))
                                if(sf.roomIds.Contains(tempRoom.sid))
                                {
                                    showList.Add(sf);
                                }