Merge branch 'CJL' into temp-wxr

wxr

2021-02-23 98d002e55304e5c8ff13b7cd195920975bef69f5

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

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