Merge remote-tracking branch 'origin/Develop' into Develop

chenshijun

2018-12-20 7396acaaf172f25c7bf110e930a74cc133c5d342

 QiaoJiaSystem/build/config.json

@@ -1,4 +1,5 @@
{
  "FaceDetectionSampleSize": 720,
  "mainServerIp": "192.168.1.203",
  "mainServerPort": "3697",
  "logPath": "/home/dell/work/log/",