Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq

pansen

2019-04-22 4d1c2ee860222138fc7932225ea6d91e7483646a

 QiaoJiaSystem/StructureApp/PerimeterElement.h

@@ -86,6 +86,11 @@

    int npts;
   std::vector<cv::Rect> m_recVec;

   //todo debug
    std::vector<float> m_scoreVec;
    std::vector<std::string> m_objTypeVec;


   bool m_bIsMask;
   std::vector<Point> poly1;