From 4f70d72daca6818a8a7ba36d794b0cd7f985cbcc Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 10 一月 2019 18:23:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2

---
 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