Merge svn 3352

pansen

2019-01-10 ffa3485e9d36911f3b6aeac7ddbcca61c3e3dde6

 QiaoJiaSystem/DataManagerServer/CMakeLists.txt

@@ -96,6 +96,8 @@
    ../FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.h
    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp



    ../../syncDBTool/ErlangDbTool.cpp