Merge branch 'yangwu1.3' into 1.3nsq

pansen

2019-04-03 17ae0cd78c16f55d38dc3f9ad6b27688f445aee3

 QiaoJiaSystem/PerimeterAlarm/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", 1);

    //yolo server