From 07fb2c16c75734d8c127585353249f529ea1262c Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期四, 14 三月 2019 17:39:25 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2.fixbug

---
 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 20ac800..8822702
--- a/QiaoJiaSystem/build/FaceDetectServer
+++ b/QiaoJiaSystem/build/FaceDetectServer
Binary files differ

--
Gitblit v1.8.0