Merge branch 'master' into WJC

陈嘉乐

2020-11-30 c44b10e4447e84dbdfa9105edf460ef364a8f2b3

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

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