Merge branch 'WJC' into NewFilePath

wxr

2021-01-04 c4f0723cc7053933a6e598eb0c58cfdf4e9d7459

 HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs

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