Merge branch 'yw.1.2' into yangwu1.3

pansen

2019-04-03 adb08adc83dfe9dc5d6170c2322952d77a93c510

 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