.3nsq: Auto stash before merge of "1.3nsq" and "origin/1.3nsq"

pans

2019-04-15 0a762a217fe499b7b63d55ed4b46dde1afd49f28

 QiaoJiaSystem/CMakeLists.txt

@@ -36,4 +36,4 @@
add_subdirectory(VideoToImageMulth)
#add_subdirectory(GB28181DecoderModel)
#add_subdirectory(FaceSearchDbWithImg)

add_subdirectory(VptServer)