From 3143aab798b6ea93a472a6b32f69a6aabc7da04e Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 08 三月 2019 16:28:25 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.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