Merge branch 'GSP' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into GSP

OTSCPP/OTSControl/COTSHardwareMgr.cpp

@@ -72,7 +72,7 @@ namespace OTSController {
 				}
 			}
 
-			LogTrace(__FILE__, __LINE__, "(COTSHardwareMgr::GetSemControllerMgrPtr) szSemName = %s,  szEdsName = %s", szSemName, szEdsName);
+			LogTrace(__FILE__, __LINE__, "(COTSHardwareMgr::GetSemControllerMgrPtr) SemName = %s,  EdsName = %s", szSemName, szEdsName);
 
 			iDevID = this->GetSemControllerID(szSemName);
 			switch (iDevID)