Merge branch 'WJC' into NewFilePath

wxr

2021-01-04 c4f0723cc7053933a6e598eb0c58cfdf4e9d7459

 HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs

@@ -18,7 +18,7 @@
            actionRefresh = () => {
                btnFunctionName.Text = btnFunctionName_Out.Text = tv.name;
                btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = tv.GetRoomListName();
                tv.SaveFunctionData(true);
                tv.UpdataFuncitonInfo();
            };
        }