diff --git a/Backend/Controllers/BuildInfoController.cs b/Backend/Controllers/BuildInfoController.cs
index 9fc3a02..24faf5b 100644
--- a/Backend/Controllers/BuildInfoController.cs
+++ b/Backend/Controllers/BuildInfoController.cs
@@ -47,7 +47,7 @@ namespace Backend.Controllers
             try
             {
                 var sqlString = @$"SELECT A.priority, A.building_tag, A.full_name, A.ip_address, A.ip_port, (SELECT COUNT(*) FROM floor f WHERE f.deleted = 0 AND f.building_tag = A.building_tag) AS 'floorNum', A.created_at,
-                                        A.orgName_3D, A.extName_3D
+                                        A.orgName_3D, A.extName_3D, forge_light_group
                                    FROM building A
                                    WHERE A.deleted = 0
                                    ORDER BY A.priority ASC, A.created_at DESC";
diff --git a/Backend/Models/BuildModel.cs b/Backend/Models/BuildModel.cs
index 8c3784d..a80232d 100644
--- a/Backend/Models/BuildModel.cs
+++ b/Backend/Models/BuildModel.cs
@@ -22,6 +22,11 @@ namespace Backend.Models
         public string extName_3D { get; set; }
         public string urn_3D { get; set; }
         //public string Created_at { get; set; }  //建立時間
+
+        /// <summary>
+        /// 0single_1group；燈控是否為群控/單獨(個別燈具)控制
+        /// </summary>
+        public Int16 forge_light_group { get; set; }
     }
 
     public class BuildFloor : Actor
diff --git a/Backend/appsettings.Development.json b/Backend/appsettings.Development.json
index e02e024..4dca5d7 100644
--- a/Backend/appsettings.Development.json
+++ b/Backend/appsettings.Development.json
@@ -16,8 +16,8 @@
     "MySqlDBConfig": {
       "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201
       "Port": "js2LutKe+rdjzdxMPQUrvQ==",
-      "Database": "VJB2XC+lAtzuHObDGMVOAA==", //30  
-      //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
+      //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30  
+      "Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
       "Root": "SzdxEgaJJ7tcTCrUl2zKsA==",
       "Password": "FVAPxztxpY4gJJKQ/se4bQ=="
     }
diff --git a/Backend/appsettings.json b/Backend/appsettings.json
index 42086f8..1087b28 100644
--- a/Backend/appsettings.json
+++ b/Backend/appsettings.json
@@ -16,7 +16,7 @@
     "MySqlDBConfig": {
       "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201
       "Port": "js2LutKe+rdjzdxMPQUrvQ==",
-      //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //三菱
+     // "Database": "VJB2XC+lAtzuHObDGMVOAA==", //三菱
       "Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
       "Root": "SzdxEgaJJ7tcTCrUl2zKsA==",
       "Password": "FVAPxztxpY4gJJKQ/se4bQ=="
diff --git a/Frontend/_energyManagement.html b/Frontend/_energyManagement.html
index a9aed50..bd597c3 100644
--- a/Frontend/_energyManagement.html
+++ b/Frontend/_energyManagement.html
@@ -268,13 +268,13 @@
     ytAjax = new YourTeam.Ajax(url, objSendData, function (res) {
       if (!res || res.code != "0000" || !res.data) {
 
-      } else {
-        let strHtml = '';
-        $.each(res.data.history_Main_Systems, (index, mainSysObj) => {
-          $.each(mainSysObj.history_Sub_systems, (index2, subSysObj) => {
-            subSysList.push(subSysObj);
-            if ((type == 0 || (type == 3 && mainSysObj.main_system_tag == "ELEV")) && filNotShowSysSub.indexOf(subSysObj.sub_system_tag) == -1) {
-              strHtml += `<div class="col-sm-12 col-xl-4 mb-2">
+            } else {
+                let strHtml = '';
+                $.each(res.data.history_Main_Systems, (index, mainSysObj) => {
+                    $.each(mainSysObj.history_Sub_systems, (index2, subSysObj) => {
+                        subSysList.push(subSysObj);
+if ((type == 0 || (type == 3 && mainSysObj.main_system_tag == "ELEV")) && filNotShowSysSub.indexOf(subSysObj.sub_system_tag) == -1) {
+                            strHtml += `<div class="col-sm-12 col-xl-4 mb-2">
                                             <div class="card elecCard cur-poi" data-id="${mainSysObj.main_system_tag}_${subSysObj.sub_system_tag}" data-name="${subSysObj.full_name}">
                                                 <div class="card-body">
                                                     <h4 class="card-title color-white">${subSysObj.full_name}用電</h4>
diff --git a/FrontendWebApi/ApiControllers/DeviceManageController.cs b/FrontendWebApi/ApiControllers/DeviceManageController.cs
index 2757769..f16601e 100644
--- a/FrontendWebApi/ApiControllers/DeviceManageController.cs
+++ b/FrontendWebApi/ApiControllers/DeviceManageController.cs
@@ -176,7 +176,7 @@ namespace FrontendWebApi.ApiControllers
 
 
         /// <summary>
-        /// 東別列表
+        /// 棟別列表
         /// </summary>
         /// <param name="account"></param>
         /// <returns></returns>
@@ -188,7 +188,7 @@ namespace FrontendWebApi.ApiControllers
 
             try
             {
-                var sqlString = $@"select building_tag, full_name, urn_3D from building where deleted = 0 order by priority";
+                var sqlString = $@"select building_tag, full_name, urn_3D, forge_light_group from building where deleted = 0 order by priority";
                 var bl = await backendRepository.GetAllAsync<BuildList>(sqlString);
 
                 apiResult.Code = "0000";
diff --git a/FrontendWebApi/Models/Device.cs b/FrontendWebApi/Models/Device.cs
index b8eb38d..d1bcfc2 100644
--- a/FrontendWebApi/Models/Device.cs
+++ b/FrontendWebApi/Models/Device.cs
@@ -19,6 +19,10 @@ namespace FrontendWebApi.Models
         public string full_name { get; set; }
         public string building_tag { get; set; }
         public string urn_3D { get; set; }
+        /// <summary>
+        /// 0single_1group；燈控是否為群控/單獨(個別燈具)控制
+        /// </summary>
+        public Int16 forge_light_group { get; set; }
     }
 
     public class FloorList