Merge branch 'CJL' into temp-wxr

wxr

2021-02-23 98d002e55304e5c8ff13b7cd195920975bef69f5

 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();
            };
        }