Merge branch 'Develop'

chenshijun

2018-12-20 a955c3bf9ee78f9a839726edb030fecf74399d2d

 QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.ice

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