Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq

chenshijun

2019-04-15 ad8ee0872802ba5d0194458bf215a6cc89f4d0d0

 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