Merge remote-tracking branch 'origin/WJC' into NewFilePath

wei

2020-12-11 82423359112f65458fd9a80418da0bda5e9364d9

 HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs

@@ -47,7 +47,7 @@
            {
                btnFunctionName.Text = btnFunctionName_Out.Text = fh.name;
                btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = fh.GetRoomListName();
                fh.SaveFunctionData(true);
                //fh.SaveFunctionData(true);
            };
        }