Merge branch 'master' into Develop

pansen

2019-01-04 a9e9e90b0c0a8fa7f0b78b29101a3dc13a021a5d

 QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.ice

@@ -43,7 +43,7 @@
      FaceAngle   fAngle;
      int         nQuality;
      Data         pFacialData;
        long        pfaceId;
      long        pfaceId;
   }
   
   sequence<FacePos> Faces;