Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2

pansen

2019-01-10 4f70d72daca6818a8a7ba36d794b0cd7f985cbcc

 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>