忽略冲突test

house365-hgs-web/src/main/java/com/house365/web/util/AddressUtils.java

@@ -15,6 +15,7 @@ public class AddressUtils {
         //这里调用百度的ip定位api服务 详见 http://api.map.baidu.com/lbsapi/cloud/ip-location-api.htm
 //        JSONObject json = readJsonFromUrl("http://api.map.baidu.com/location/ip?ak=F454f8a5efe5e577997931cc01de3974&ip=218.94.115.134");
 //        System.out.println(json.toString());
+
 //        System.out.println(((JSONObject) json.get("content")).get("address"));
     }
 

house365-hgs-ws/src/test/java/com/test/ExecutorPoolTest.java

@@ -11,7 +11,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  * <p>Title: </p>
  * <p>Description: </p>
  * <p>Date: 2017/12/14</p>
- *
+ *test
  * @author XN
  * @version 1.0
  */