合并代码解决冲突

miyanhui

2019-02-18 b5413f1f00fcf13104b07807e2046372764ef8dc

 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