Merge remote-tracking branch 'origin/ywv1.2_布控feature' into ywv1.2_布控feature

pansen

2019-01-25 30d0bd43f53740554e8387fcd14bfab689eeca9c

 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