Merge branch 'yangwu1.3' into 1.3nsq

pansen

2019-04-03 17ae0cd78c16f55d38dc3f9ad6b27688f445aee3

 QiaoJiaSystem/StructureApp/FaceRpcElement.h

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

#endif // FACERPCELEMENT_H