Merge branch 'Release2.3' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.3

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -1699,11 +1699,11 @@ namespace OTSMeasureApp
 
             //加载相关参数信息
             //StageLoad();
-            LoadSEMStageData();
-            LoadImageScanPrm();
-            LoadCGenParam();
-            LoadImageProc();
-            LoadXRayParam();
+            //LoadSEMStageData();
+            //LoadImageScanPrm();
+            //LoadCGenParam();
+            //LoadImageProc();
+            //LoadXRayParam();
         }
         /// <summary>
         /// 通过id设置当前正在工作的样品台