Merge branch 'ywv1.2' into ywv1.2_布控feature

pans

2019-01-28 53630c440d592792dcdd86f8d5b2c59da4f3c359

 QiaoJiaSystem/build/config.json

@@ -1,6 +1,6 @@
{
  "DEV_ID": "DSVAD010120181119",
  "ES_IP": "192.168.1.122",
  "ES_IP": "192.168.1.182",
  "ES_PORT": 9200,
  "FaceDetectionSampleSize": 720,
  "FaceSeachSleepTime": 60,