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

pans

2019-01-31 efafab5273ba3ff13a19f07088c320a5180188b6

 QiaoJiaSystem/StructureApp/FaceExtractElement.h

@@ -1,4 +1,4 @@
#ifndef FACEEXTRACTELEMENT_H
#ifndef FACEEXTRACTELEMENT_H
#define FACEEXTRACTELEMENT_H

#include <FaceServer.h>