Merge remote-tracking branch 'origin/TC'

othersoft/calibration_console/Header_Files/ZZ_Types.h

@@ -2,6 +2,8 @@
 //<2F><><EFBFBD><EFBFBD>˵<EFBFBD><CBB5><EFBFBD>ļ<EFBFBD>
 //////////////////////////////////////////////////////////////////////////
 #pragma once
+#pragma pack(1)//<2F>ṹ<EFBFBD>尴<EFBFBD><E5B0B4>1<EFBFBD>ֽڶ<D6BD><DAB6><EFBFBD><EFBFBD>洢
+
 #include <string>
 #include <QTime>
 
@@ -351,4 +353,5 @@ namespace ZZ_MISCDEF
             QString qstrInterfaceName;
         }HumitureDeviceInfo;
     }
-};
+};
+#pragma pack()//<2F>ָ<EFBFBD>Ĭ<EFBFBD><C4AC><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD>루<EFBFBD><EBA3A8><EFBFBD><EFBFBD>8<EFBFBD>ֽڣ<D6BD>

othersoft/calibration_console/Header_Files/calibration.h

@@ -1,5 +1,4 @@
 #pragma once
-#pragma pack(1)//结构体按照1字节对齐存储
 #include <qthread.h>
 //#include <QFileDialog>
 #include <QFile>