1.2_布控feature: Auto stash before merge of "ywv1.2_布控feature" and "origin/yw...

pans

2019-01-31 efafab5273ba3ff13a19f07088c320a5180188b6

 QiaoJiaSystem/CMakeLists.txt

@@ -22,6 +22,7 @@
add_subdirectory(RapidStructureApp)
add_subdirectory(RecordVideo)
add_subdirectory(DataManagerServer)
add_subdirectory(EncodeServer)


#add_subdirectory(FaceSearchDbWithImg)