Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq

pansen

2019-04-22 4d1c2ee860222138fc7932225ea6d91e7483646a

 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;
};

/***