修改冲突

src/main/java/com/steerinfo/dil/feign/ESFeign.java

@@ -16,7 +16,7 @@ import java.util.Map;
  */
 
 
-@FeignClient(value = "DIL-ES-DEV", url = "172.16.33.161:8089/api/v1/es")
+@FeignClient(value = "DIL-ES-DEV", url = "172.16.33.166:8089/api/v1/es")
 public interface ESFeign {
     @PostMapping("getConResult")
     PageListAdd getConResult(@RequestBody(required = false) Map<String, Object> mapValue,

src/main/resources/bootstrap.yml

@@ -45,11 +45,12 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.166:8079}
   ImFeign:
-    url: ${IMFEIGN_URL:172.16.33.162:8055}
+    url: ${IMFEIGN_URL:172.16.33.166:8055}
+
 
 
 mybatis: