Merge remote-tracking branch 'origin/CJL-NEW' into NewFilePath

wei

2020-12-11 37dc5f07121946aa03ce96030a9f400af032367d

 HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs

@@ -37,7 +37,7 @@
            actionRefresh = () => {
                btnFunctionName.Text = btnFunctionName_Out.Text = light.name;
                btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = light.GetRoomListName();
                light.SaveFunctionData(true);
                //light.SaveFunctionData(true);
            };
        }