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

wei

2020-12-23 d814c978efc068425c500a553cf7ec6b4f628219

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

@@ -68,7 +68,7 @@
            btnCollection.MouseUpEventHandler += (sender, e) =>
            {
                btnCollection.IsSelected = fh.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
                fh.SaveFunctionData(true);
                fh.CollectFunction();
            };
        }