Merge branch 'yangwu1.3' into 1.3nsq

pansen

2019-04-03 17ae0cd78c16f55d38dc3f9ad6b27688f445aee3

 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