Merge remote-tracking branch 'origin/yangwu1.3' into yangwu1.3

pans

2019-03-30 99221e4721a1246883465c2b52fbff14eb9aaa7a

 QiaoJiaSystem/StructureApp/FaceRpcElement.h

@@ -54,6 +54,7 @@
    TriggerElement m_triggerElement;
    SdkRule m_sdkRule;
    bool m_bIsMask;
    bool m_bSetWH;
};

#endif // FACERPCELEMENT_H