Merge branch 'clh' into liuyang

mrDarker

6 天以前 829fe6c6bc33d53fda9c31fd45a37e1df87befff

 SourceCode/Bond/Servo/CJobDataS.cpp

@@ -618,9 +618,9 @@
      index += sizeof(short);

      memcpy(&m_nQTime[1], &pszBuffer[index], sizeof(short));
      index += sizeof(int);
      index += sizeof(short);

      memcpy(&m_nQTime[2], &pszBuffer[index], sizeof(int));
      memcpy(&m_nQTime[2], &pszBuffer[index], sizeof(short));
      index += sizeof(short);

      memcpy(&m_nQTimeOverFlag, &pszBuffer[index], sizeof(short));