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

wei

2020-12-23 0891d90cd0d435338cc2851fd0830cd318a17fff

 HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs

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