Merge branch 'master' into Develop

pansen

2019-01-04 a9e9e90b0c0a8fa7f0b78b29101a3dc13a021a5d

 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>