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/DataManagerServer/http_configserver.h | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.h b/QiaoJiaSystem/DataManagerServer/http_configserver.h
index 1261485..3fe1e83 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.h
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.h
@@ -203,7 +203,8 @@
void
addPersonMToDB(const string &TableName, const string &img_url, const string &SyncType, const string &feature_base64,
- const Features &faceResults, string &idcard, string &strUUID, bool &ret_addPerson);
+ const Features &faceResults, string &idcard, string &strUUID, string &monLevel, string &Enabled,
+ bool &ret_addPerson);
void getMat(string &img_url, const string &img_base64, cv::Mat &image) const;
};
--
Gitblit v1.8.0