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

wei

2020-12-23 305fe4c61143448ca41fd820f2a14e79d236652b

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