From fa7e820c7715eb9294c9bae62c6f75fd3bda4f0d Mon Sep 17 00:00:00 2001
From: zhangjixing <775834166@qq.com>
Date: 星期二, 15 一月 2019 17:28:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2

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

diff --git a/QiaoJiaSystem/StructureApp/FaceRpcElement.cpp b/QiaoJiaSystem/StructureApp/FaceRpcElement.cpp
index 5399c59..3a4c807 100644
--- a/QiaoJiaSystem/StructureApp/FaceRpcElement.cpp
+++ b/QiaoJiaSystem/StructureApp/FaceRpcElement.cpp
@@ -123,6 +123,7 @@
                 trackingTrigger->getLastRect().properties["smile"] = to_string(property.smile_level);
                 trackingTrigger->getLastRect().properties["race"] = to_string(property.race);
                 trackingTrigger->getLastRect().properties["time"] = getProperty("time");
+                trackingTrigger->getLastRect().properties["detectscore"] = scoredRect.score;
 
                 triggerFaces.push_back(face);
                 triggerMats.push_back(image(

--
Gitblit v1.8.0