Merge branch 'dev-tzy' into temp-wxr

wxr

2021-02-26 6a09cc33a9e800f640046350a69ba63a31f1f64b

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