Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2

zhangjixing

2019-01-15 fa7e820c7715eb9294c9bae62c6f75fd3bda4f0d

 QiaoJiaSystem/StructureApp/PerStaticElement.h

@@ -79,6 +79,7 @@
    std::vector<ScoredRect> m_lastScoreRect;
    unsigned long long m_lTime;
    EsDBTool* pManagerEsDB;
    bool m_bIsMask;
};

#endif // PAELEMENT_H