Merge branch '同兴达分出-改到信利(不推治具)' of https://gitee.com/bestlqiang/TwoLaserHead-PushJig.git

LaiPuLaser/ClientMgr.h

@@ -70,8 +70,7 @@ private:
 	virtual BOOL OnMessagePending() override;
 	LONGLONG m_llDtStart;
 	UINT  m_uTimeOut;
-
-	//end--------------设定读写超时相关---------------------
+//end--------------设定读写超时相关---------------------
 
 	void SendCmd_TransFile(CString filePath);//给伺服端传文件（复制到共享盘，无通信）
 	void DoEvents();

LaiPuLaser/CommonFlowMgr.cpp

@@ -1432,6 +1432,7 @@ bool CCommonFlowMgr::CameraCatchMark3(CProduct &Product)
 	//移动目标点(ccd 的中心)
 	Dbxy CameraPt = Camera.GetCoord();
 
+
 	CWorkCmdInvoker Invoker;
 	CWorkCmdContainer  &CmdContainer = CWorkCmdContainer::GetInstance();//指令集
 	CmdContainer.Clear();