From f76e6f73d57015a04272f05a48c27bfd42b14015 Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期三, 13 二月 2019 17:33:27 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of http://192.168.1.226:10010/r/development/c++ 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