Merge branch 'yw.1.2' into yangwu1.3

pansen

2019-04-03 adb08adc83dfe9dc5d6170c2322952d77a93c510

 QiaoJiaSystem/StructureApp/main.cpp

@@ -18,7 +18,7 @@
    std::string src_path = "/home/basic/视频/test";


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

    //yolo server