Merge branch 'wjc' into Dev-1.9

wxr

2023-07-19 fd0bbcd6e475754d88cedb798000ebeb375d07e4

 HDL_ON/Entity/Room.cs

@@ -504,6 +504,13 @@
                        functions.Add(f);
                    }
                }
                foreach(var g in FunctionList.List.groupControls)
                {
                    if (g.roomIds.Contains(roomId) && roomId != null)
                    {
                        functions.Add(g);
                    }
                }
            }
            return functions;
        }