Merge remote-tracking branch 'origin/yw.1.2.fixbug' into yw.1.2

pansen

2019-02-28 fd6b130ed52e1412ccb1ff8bf7891a90a6f96d31

 QiaoJiaSystem/YoloServer/YoloRpcElement.h

@@ -7,7 +7,8 @@
#include <opencv2/opencv.hpp>
#include <basic/util/fastdfs/FastFds.hpp>
#include <TriggerElement.h>
#include "TrackingTrigger.h"
//#include "../StructureApp/YoloRpcElement.h"
#include "../StructureApp/TrackingTrigger.h"

class QSharedMemory;