diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index 369d1c2..7d545f7 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -1,14 +1,9 @@ /**服务端地址**/ //var BASE_PATH = "http://youfang.fangjia.com"; //var BASE_PATH = "http://192.168.10.128:8084"; -<<<<<<< HEAD var BASE_PATH = "http://192.168.10.47:8086"; -//var BASE_PATH = "http://192.168.10.161:8084"; -======= -//var BASE_PATH = "http://192.168.10.47:8086"; ->>>>>>> 9c25ef0b2e3f9e2a19df5038da587d6c53827469 //var BASE_PATH = "http://192.168.10.53:8084"; -var BASE_PATH = "http://192.168.10.161:8084"; +//var BASE_PATH = "http://192.168.10.161:8084"; //var BASE_PATH = "http://192.168.10.170:8084"; //var BASE_PATH = "http://192.168.10.171:8084"; //var BASE_PATH = "http://192.168.10.164:8084";