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/PerimeterElement.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
index df68f9a..36efe0c 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
@@ -1,5 +1,5 @@
 #include "PerimeterElement.h"
-#include <basic/event/EventBus.hpp>
+//#include <basic/event/EventBus.hpp>
 #include <basic/debug/Debug.h>
 #include <iostream>
 #include <opencv2/opencv.hpp>

--
Gitblit v1.8.0