Merge branch 'testBranch' into feature_addPersonTracking

pansen

2018-12-19 8a96af322596e8feababb48b427579b7114feceb

 QiaoJiaSystem/StructureApp/PerimeterElement.cpp

@@ -1,5 +1,5 @@
#include "PerimeterElement.h"
#include <basic/event/EventBus.hpp>
//#include <basic/event/EventBus.hpp>
#include <basic/debug/Debug.h>
#include <iostream>
#include <opencv2/opencv.hpp>