From 16bea1d248f0010049bceaa562939297fa26b130 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 15:27:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch-2024' into wjc
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
index beb7360..2b6d410 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
@@ -79,6 +79,7 @@
this.funs_RoomAll.AddRange(funs_RoomAll);
this.funs_Del = new List<ShareData>();
this.refreshAction = refreshAction;
+ this.BackgroundColor = CSS_Color.BackgroundColor;
}
public void LoadPage(int tId)
@@ -240,7 +241,7 @@
/// </summary>
public string name;
/// <summary>
- /// 鍒嗕韩绫诲瀷 1.ROOM 2.DEVICE 3.SCENE
+ /// 鍒嗕韩绫诲瀷 1.ROOM 2.DEVICE 3.SCENE 4.DEVICE_GROUP_CONTROL
/// </summary>
public string shareType = ShareType.DEVICE.ToString();
}
--
Gitblit v1.8.0