merge Dev into Current

pansen

2018-12-19 753128ce82ff3ce8c9617768b88378f785a6088b

 QiaoJiaSystem/FaceDetectServer/FaceDetectServerI.cpp

@@ -56,6 +56,7 @@
                memcpy(&face, &pos, sizeof(pos) - sizeof(pos.pFacialData));
                face.pFacialData.resize(sizeof(pos.pFacialData));
                memcpy(face.pFacialData.data(), pos.pFacialData, sizeof(pos.pFacialData));
                face.pfaceId = -1;
//                DBG(face.fAngle.confidence);
                faces.push_back(face);
            }