From fa7e820c7715eb9294c9bae62c6f75fd3bda4f0d Mon Sep 17 00:00:00 2001
From: zhangjixing <775834166@qq.com>
Date: 星期二, 15 一月 2019 17:28:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2

---
 QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.ice |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.ice b/QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.ice
index 5d04641..04743fc 100644
--- a/QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.ice
+++ b/QiaoJiaSystem/FaceDetectServer/rpc/FaceServer.ice
@@ -43,7 +43,7 @@
 		FaceAngle	fAngle;
 		int			nQuality;
 		Data   		pFacialData;
-        long        pfaceId;
+		long        pfaceId;
 	}
 	
 	sequence<FacePos> Faces;

--
Gitblit v1.8.0