From 91fbc7bca400b7ce958e306f09133e4cfc6db63b Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 03 四月 2019 11:23:25 +0800
Subject: [PATCH] Merge branch 'yangwu1.3' of ssh://192.168.1.226:29418/development/c++ into yangwu1.3

---
 QiaoJiaSystem/StructureApp/FaceRpcElement.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/QiaoJiaSystem/StructureApp/FaceRpcElement.h b/QiaoJiaSystem/StructureApp/FaceRpcElement.h
index deec82f..64002da 100644
--- a/QiaoJiaSystem/StructureApp/FaceRpcElement.h
+++ b/QiaoJiaSystem/StructureApp/FaceRpcElement.h
@@ -53,6 +53,8 @@
     QPolygon mPolygon;
     TriggerElement m_triggerElement;
     SdkRule m_sdkRule;
+    bool m_bIsMask;
+    bool m_bSetWH;
 };
 
 #endif // FACERPCELEMENT_H

--
Gitblit v1.8.0