Merge branch 'WJC' into NewFilePath

wxr

2021-01-27 df7dd3e3f8830eceb615c59099631fc2a744b0ee

 HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs

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