From 30d0bd43f53740554e8387fcd14bfab689eeca9c Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 25 一月 2019 21:03:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywv1.2_布控feature' into ywv1.2_布控feature

---
 QiaoJiaSystem/build/FaceDetectServer |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/QiaoJiaSystem/build/FaceDetectServer b/QiaoJiaSystem/build/FaceDetectServer
old mode 100644
new mode 100755
index a726aed..8822702
--- a/QiaoJiaSystem/build/FaceDetectServer
+++ b/QiaoJiaSystem/build/FaceDetectServer
Binary files differ

--
Gitblit v1.8.0