From b5413f1f00fcf13104b07807e2046372764ef8dc Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期一, 18 二月 2019 10:12:41 +0800
Subject: [PATCH] 合并代码解决冲突
---
QiaoJiaSystem/StructureApp/FaceRpcElement.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/FaceRpcElement.h b/QiaoJiaSystem/StructureApp/FaceRpcElement.h
index bb12780..64002da 100644
--- a/QiaoJiaSystem/StructureApp/FaceRpcElement.h
+++ b/QiaoJiaSystem/StructureApp/FaceRpcElement.h
@@ -54,6 +54,7 @@
TriggerElement m_triggerElement;
SdkRule m_sdkRule;
bool m_bIsMask;
+ bool m_bSetWH;
};
#endif // FACERPCELEMENT_H
--
Gitblit v1.8.0