From adb08adc83dfe9dc5d6170c2322952d77a93c510 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 09:54:33 +0800
Subject: [PATCH] Merge branch 'yw.1.2' into yangwu1.3

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

diff --git a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
index 797e683..46bbeb2 100644
--- a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
+++ b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
@@ -111,7 +111,7 @@
     ../LocalDBTool/SqliteFaceEncap.cpp
     ../../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.cpp
     ../../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.h
-    )
+        vss/dao/BaseDao.cpp)
 
 target_link_libraries(DataWebServer
     glog

--
Gitblit v1.8.0