From 91fbc7bca400b7ce958e306f09133e4cfc6db63b Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 03 四月 2019 11:23:25 +0800
Subject: [PATCH] Merge branch 'yangwu1.3' of ssh://192.168.1.226:29418/development/c++ into yangwu1.3

---
 QiaoJiaSystem/StructureApp/AppPipeControllerTest.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/QiaoJiaSystem/StructureApp/AppPipeControllerTest.cpp b/QiaoJiaSystem/StructureApp/AppPipeControllerTest.cpp
index 2bc4af0..2256516 100644
--- a/QiaoJiaSystem/StructureApp/AppPipeControllerTest.cpp
+++ b/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

--
Gitblit v1.8.0