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

pans

2019-04-15 0a762a217fe499b7b63d55ed4b46dde1afd49f28

 QiaoJiaSystem/StructureApp/AppPipeControllerTest.cpp

@@ -15,7 +15,7 @@

//    pManagerEsDB.faceResInsert("facedb","6666666","{\"test222\":\"sdfasdf\"}");

    appPref.setLongData("gpu.index", 0);
    appPref.setIntData("gpu.index", 0);
    appPref.setIntData("show.image", 1);

    //yolo server