Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ i...

pansen

2019-03-08 5fa7c97d9544e7afdf781a93e8ffb58dce22c977

 QiaoJiaSystem/DataManagerServer/CMakeLists.txt

@@ -110,7 +110,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