Merge remote-tracking branch 'origin/yangwu1.3' into yangwu1.3

pans

2019-03-30 99221e4721a1246883465c2b52fbff14eb9aaa7a

 QiaoJiaSystem/FaceSearchServer/AlarmServer.hpp

@@ -34,6 +34,8 @@
    std::vector<std::vector<unsigned char>> features;
    std::string faceUrl;
    std::string idcard;
    std::string enabled;
    std::string monLevel;
};

/***