From cdfb8eb2a956d25d688033be735f4741b2ab58bd Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 15 三月 2019 09:48:42 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug

---
 QiaoJiaSystem/YoloServer/YoloRpcElement.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/QiaoJiaSystem/YoloServer/YoloRpcElement.h b/QiaoJiaSystem/YoloServer/YoloRpcElement.h
index e31e3fa..bc48aeb 100644
--- a/QiaoJiaSystem/YoloServer/YoloRpcElement.h
+++ b/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;
 

--
Gitblit v1.8.0