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

pansen

2019-01-10 0436e5443295395025f89f0d091aab1e9551d1a4

 QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt

@@ -57,6 +57,8 @@
    ../StructureApp/NewEncodeVideoManager.cpp
    ../StructureApp/NewEncodeVideo.cpp
    ../StructureApp/HiredisTool.cpp
     ../StructureApp/PersonElement.cpp
    ../StructureApp/PerStaticElement.cpp

    ../YoloServer/rpc/YoloServer.cpp
    ../FaceDetectServer/rpc/FaceServer.cpp
@@ -77,6 +79,7 @@
    ../../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.cpp
    ../../../BasicPlatForm/basic/util/BASE64/Base64.cpp
    ../../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp

    #线程池
    myThread.cpp