Merge remote-tracking branch 'origin/WJC'

wxr

2020-12-01 a46cd0adb5af29e8a9cf47c219475acaedfcf839

 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);
                                }