From efafab5273ba3ff13a19f07088c320a5180188b6 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期四, 31 一月 2019 10:49:56 +0800
Subject: [PATCH] 1.2_布控feature: Auto stash before merge of "ywv1.2_布控feature" and "origin/ywv1.2_布控feature"

---
 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