From a9e9e90b0c0a8fa7f0b78b29101a3dc13a021a5d Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 04 一月 2019 11:01:50 +0800
Subject: [PATCH] Merge branch 'master' into Develop

---
 QiaoJiaSystem/StructureApp/YoloRpcElement.cpp |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/QiaoJiaSystem/StructureApp/YoloRpcElement.cpp b/QiaoJiaSystem/StructureApp/YoloRpcElement.cpp
index 7f660d7..0a47849 100644
--- a/QiaoJiaSystem/StructureApp/YoloRpcElement.cpp
+++ b/QiaoJiaSystem/StructureApp/YoloRpcElement.cpp
@@ -10,7 +10,6 @@
 #include <uuid/uuid.h>
 #include <jsoncpp/json/json.h>
 
-#include <basic/db/ES/es/ManagerEsDB.h>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 

--
Gitblit v1.8.0