From 0a762a217fe499b7b63d55ed4b46dde1afd49f28 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期一, 15 四月 2019 16:57:06 +0800
Subject: [PATCH] .3nsq: Auto stash before merge of "1.3nsq" and "origin/1.3nsq"

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