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

pansen

2019-01-05 f53e1204bd4a21f74cb5872030f1eadf231eedc7

 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>