Merge remote-tracking branch 'origin/WJC' into NewFilePath

wei

2020-12-23 0891d90cd0d435338cc2851fd0830cd318a17fff

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

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