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

pansen

2019-01-10 0436e5443295395025f89f0d091aab1e9551d1a4

 QiaoJiaSystem/CMakeLists.txt

@@ -16,7 +16,7 @@

add_subdirectory(StructureApp)
add_subdirectory(FaceDetectServer)
#add_subdirectory(YoloServer)
add_subdirectory(YoloServer)
add_subdirectory(FaceSearchServer)
add_subdirectory(VideoAnalysFromHC)
add_subdirectory(RapidStructureApp)