Merge branch 'ywv1.2' into ywv1.2_布控feature

pans

2019-01-28 53630c440d592792dcdd86f8d5b2c59da4f3c359

 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 {