Merge remote-tracking branch 'origin/ywv1.2_布控feature' into ywv1.2_布控feature

pansen

2019-01-25 30d0bd43f53740554e8387fcd14bfab689eeca9c

 QiaoJiaSystem/StructureApp/FaceExtractElement.h

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

#include <FaceServer.h>