Merge branch 'Dev-Branch-2024' into wjc

mac

2024-07-25 16bea1d248f0010049bceaa562939297fa26b130

 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs

@@ -315,7 +315,7 @@
                        roomFunctionOrSceneList.Add(new RoomData()
                        {
                            shareTypeId = fun.deviceId,
                            shareType = ShareType.DEVICE.ToString(),
                            shareType = fun.spk == SPK.GroupControl ? "DEVICE_GROUP_CONTROL" : ShareType.DEVICE.ToString(),
                            name = fun.name,
                        });
                    }