Merge branch 'CJL-NEW' into NewFilePath

wxr

2020-12-11 fb1d2ee8a53c56dbb22f38fccb83335fd489456f

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