Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2

zhangjixing

2019-01-15 fa7e820c7715eb9294c9bae62c6f75fd3bda4f0d

 QiaoJiaSystem/StructureApp/FaceExtractElement.h

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

#include <FaceServer.h>