From 051c6863dd418c9cfbca787e449fbdeadde977c7 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期二, 16 四月 2019 17:17:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq

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

diff --git a/QiaoJiaSystem/StructureApp/CMakeLists.txt b/QiaoJiaSystem/StructureApp/CMakeLists.txt
index 8eaf3c2..b15b23e 100644
--- a/QiaoJiaSystem/StructureApp/CMakeLists.txt
+++ b/QiaoJiaSystem/StructureApp/CMakeLists.txt
@@ -44,7 +44,6 @@
     ../../../BasicPlatForm/basic/util/curl/HttpRequestWithCrul.hpp
     ../../../BasicPlatForm/basic/util/net_config/net_config.cpp
     ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
-
     )
 
 SET(LIBS

--
Gitblit v1.8.0