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

pans

2019-04-15 0a762a217fe499b7b63d55ed4b46dde1afd49f28

 QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt

@@ -61,7 +61,9 @@
    ../StructureApp/PersonElement.cpp
    ../StructureApp/PerStaticElement.cpp
    ../StructureApp/IntAreaCalcUtil.cpp
    ../StructureApp/VptRpcElement.cpp

    ../VptServer/rpc/VptServer.cpp
    ../YoloServer/rpc/YoloServer.cpp
    ../FaceDetectServer/rpc/FaceServer.cpp
    ../FaceSearchServer/rpc/FaceSearchServer.cpp
@@ -182,6 +184,7 @@
    ../VideoServer/QiaoJia/DB
    ../VideoServer/QiaoJia/dispatchTool

    ../VptServer/rpc
    ../RecordVideo/rpc
    ../StructureApp/rpc
    ../YoloServer/rpc