Merge remote-tracking branch 'origin/ywv1.2_布控feature' into ywv1.2_布控feature

pansen

2019-01-25 30d0bd43f53740554e8387fcd14bfab689eeca9c

 QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt

@@ -59,6 +59,7 @@
    ../StructureApp/HiredisTool.cpp
     ../StructureApp/PersonElement.cpp
    ../StructureApp/PerStaticElement.cpp
    ../StructureApp/IntAreaCalcUtil.cpp

    ../YoloServer/rpc/YoloServer.cpp
    ../FaceDetectServer/rpc/FaceServer.cpp