From 91fbc7bca400b7ce958e306f09133e4cfc6db63b Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 03 四月 2019 11:23:25 +0800
Subject: [PATCH] Merge branch 'yangwu1.3' of ssh://192.168.1.226:29418/development/c++ into yangwu1.3

---
 QiaoJiaSystem/build/config.json |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/QiaoJiaSystem/build/config.json b/QiaoJiaSystem/build/config.json
index c365bcf..f009670 100755
--- a/QiaoJiaSystem/build/config.json
+++ b/QiaoJiaSystem/build/config.json
@@ -3,7 +3,7 @@
   "mainServerPort": "3697",
   "logPath": "/home/basic/work/log/",
   "DEV_ID": "DSVAD010120181119",
-  "ES_IP": "192.168.1.122",
+  "ES_IP": "192.168.1.182",
   "ES_PORT": 9200,
   "FaceSeachSleepTime": 60,
   "TotalLoadSize": "500",

--
Gitblit v1.8.0