Merge branch 'Dev-Wxr'

wxr

2023-06-05 753e67c3705dddb8e913bd853db151f94f81d600

 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;
        }
@@ -568,5 +575,6 @@
            scenes.Remove(scenes.Find((obj) => obj.sid == scene.sid));
        }
    }
  


}