Merge branch 'CJL' into NewFilePath

wxr

2021-01-04 6955f92085a3702cfef5473fb14a77b3d9addbcf

 HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs

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