From efafab5273ba3ff13a19f07088c320a5180188b6 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期四, 31 一月 2019 10:49:56 +0800
Subject: [PATCH] 1.2_布控feature: Auto stash before merge of "ywv1.2_布控feature" and "origin/ywv1.2_布控feature"
---
QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.cpp | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.cpp b/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.cpp
index f592c31..9d22dcf 100644
--- a/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.cpp
+++ b/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.cpp
@@ -156,6 +156,8 @@
test.features.push_back(t_fea);
test.faceUrl = it.img;
test.idcard = it.idcard;
+ test.enabled = it.enable;
+ test.monLevel = it.monLevel;
}
// //#todo
// for (auto it = mymap->begin(); it != mymap->end(); it++) {
@@ -200,6 +202,7 @@
test.faceUrl = t_sen.faceurl;
test.idcard = t_faceInfoCache[t_sen.uuid].idCard;
test.enabled = t_sen.enable;
+ test.monLevel = t_faceInfoCache[t_sen.uuid].monLevel;
}
}
// 鍛婅瘔鍒锋柊鍑芥暟锛屽綋鍓嶅簳搴撶殑鏁版嵁鍑嗗瀹屾垚
--
Gitblit v1.8.0