Merge remote-tracking branch 'origin/yw.1.2.fixbug' into yw.1.2

pansen

2019-02-28 bcf8d8c62fdf61c4c3091bbf0db32383cbd5ea9e

 QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.ice

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