Merge remote-tracking branch 'origin/TC'

This commit is contained in:
xin
2022-08-04 09:37:21 +08:00
2 changed files with 4 additions and 2 deletions

View File

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

View File

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