Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-04 2f1b0d944bd8feb7c6dca5126a4832228ba826ce

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

@@ -50,7 +50,7 @@
        void LoadCollectionEvent()
        {
            btnCollection.MouseUpEventHandler += (sender, e) => {
                btnCollection.IsSelected = fan.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
                btnCollection.IsSelected = fan.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
                fan.SaveFunctionData();
            };
        }