From 5e141a1aad79d5cf5be6f87f72fa32c3d63cdef0 Mon Sep 17 00:00:00 2001
From: tangchao0503 <735056338@qq.com>
Date: Wed, 3 Aug 2022 19:10:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9E=84=E4=BD=93=E6=8C=891=E5=AD=97?=
 =?UTF-8?q?=E8=8A=82=E5=AF=B9=E9=BD=90=E7=9A=84=E4=BB=A3=E7=A0=81#pragma?=
 =?UTF-8?q?=20pack(1)=E4=BD=BF=E7=94=A8=E9=94=99=E8=AF=AF=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4CalibrationAlgorithm::produceCalfile=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E5=9C=A8=E7=BB=93=E6=9E=84=E4=BD=93=E4=BC=A0=E5=8F=82?=
 =?UTF-8?q?=E6=97=B6=E5=87=BA=E7=8E=B0=E9=94=99=E8=AF=AF=EF=BC=88DataFrame?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E5=90=91=E5=90=8E=E6=BC=82=E7=A7=BB?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AAZZ=5FU32=EF=BC=8C=E6=9B=9D=E5=85=89=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E4=B8=BA0=EF=BC=89=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 othersoft/calibration_console/Header_Files/ZZ_Types.h    | 5 ++++-
 othersoft/calibration_console/Header_Files/calibration.h | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/othersoft/calibration_console/Header_Files/ZZ_Types.h b/othersoft/calibration_console/Header_Files/ZZ_Types.h
index 8be8efa..a9e6177 100644
--- a/othersoft/calibration_console/Header_Files/ZZ_Types.h
+++ b/othersoft/calibration_console/Header_Files/ZZ_Types.h
@@ -2,6 +2,8 @@
 //类型说明文件
 //////////////////////////////////////////////////////////////////////////
 #pragma once
+#pragma pack(1)//结构体按照1字节对齐存储
+
 #include <string>
 #include <QTime>
 
@@ -351,4 +353,5 @@ namespace ZZ_MISCDEF
             QString qstrInterfaceName;
         }HumitureDeviceInfo;
     }
-};
\ No newline at end of file
+};
+#pragma pack()//恢复默认内存对齐（按照8字节）
diff --git a/othersoft/calibration_console/Header_Files/calibration.h b/othersoft/calibration_console/Header_Files/calibration.h
index 2f65a7b..f667515 100644
--- a/othersoft/calibration_console/Header_Files/calibration.h
+++ b/othersoft/calibration_console/Header_Files/calibration.h
@@ -1,5 +1,4 @@
 #pragma once
-#pragma pack(1)//缁撴瀯浣撴寜鐓�1瀛楄妭瀵归綈瀛樺偍
 #include <qthread.h>
 //#include <QFileDialog>
 #include <QFile>