Merge branch 'wxr-2.2' into Dev-Branch

wxr

2023-10-20 4e4f9c3ee4ff6d05d5a431626901fbf43eb368a9

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