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

pansen

2019-01-15 9bbbe29c81aa9cd183e840232f2bd973937d1ef4

 QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.ice

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