合并冲突

src/main/resources/bootstrap.yml

@@ -24,39 +24,7 @@ eureka:
 
 
 openfeign:
-<<<<<<< HEAD
-#  #正式环境
-=======
-  #正式环境
-    ColumnDataFeign:
-      url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-    AmsFeign:
-      url: ${AMSFEIGN_URL:172.16.33.166:8079}
-    BmsshipFeign:
-      url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
-    BmstrainFeign:
-      url: ${BMSTRAINFEIGN_URL:172.16.33.166:8077}
-    BmstruckFeign:
-      url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
-    QmsTruckFeign:
-      url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
-    TmsTrainFeign:
-      url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
-    TmsTruckFeign:
-      url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
-    TmsshipFeign:
-      url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
-    WMSHFeign:
-      url: ${WMSHFEIGN_URL:172.16.33.166:8070}
-    WMSFeign:
-      url: ${WMSFEIGN_URL:172.16.33.166:8093}
-    OMSFeign:
-      url: ${OMSFEIGN_URL:172.16.33.166:8095}
-    RmsFeign:
-      url: ${RMSFEIGN_URL:172.16.33.166:8060}
->>>>>>> master
-
-
+#  正式环境
 #    ColumnDataFeign:
 #      url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
 #    AmsFeign: