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

chenshijun

2019-03-30 23bd97eaa5626ad96ca3f5d3e97e93d14705ca6d

 QiaoJiaSystem/StructureApp/PerStaticElement.h

@@ -80,6 +80,9 @@
    unsigned long long m_lTime;
    EsDBTool* pManagerEsDB;
    bool m_bIsMask;
    bool m_bSetWH;
     cv::Point2i* pointArray;
     int npts;
};

#endif // PAELEMENT_H