From 53630c440d592792dcdd86f8d5b2c59da4f3c359 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期一, 28 一月 2019 20:35:35 +0800
Subject: [PATCH] Merge branch 'ywv1.2' into ywv1.2_布控feature
---
QiaoJiaSystem/FaceSearchServer/CasiaFaceWrapper/FaceData.hpp | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/QiaoJiaSystem/FaceSearchServer/CasiaFaceWrapper/FaceData.hpp b/QiaoJiaSystem/FaceSearchServer/CasiaFaceWrapper/FaceData.hpp
index 926dafa..8124abd 100644
--- a/QiaoJiaSystem/FaceSearchServer/CasiaFaceWrapper/FaceData.hpp
+++ b/QiaoJiaSystem/FaceSearchServer/CasiaFaceWrapper/FaceData.hpp
@@ -32,6 +32,7 @@
std::string face_img_url;
std::string idCard;
std::string alarmRet;
+ std::string enabled;
};
struct DbAction {
--
Gitblit v1.8.0