1.2_布控feature: Auto stash before merge of "ywv1.2_布控feature" and "origin/yw...

pans

2019-01-31 efafab5273ba3ff13a19f07088c320a5180188b6

 QiaoJiaSystem/FaceSearchServer/AlarmServer.hpp

@@ -28,6 +28,7 @@
    std::string faceUrl;
    std::string idcard;
    std::string enabled;
    std::string monLevel;
};

static std::vector<std::string> AlarmServerPropertyAnalyseByComma(std::string str_list) {