Merge branch 'ywv1.2' of ssh://192.168.1.226:29418/development/c++ into ywv1.2

pansen

2019-01-10 0436e5443295395025f89f0d091aab1e9551d1a4

 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