合并冲突

src/main/resources/bootstrap.yml

@@ -35,7 +35,7 @@ openfeign:
   BmstruckFeign:
     url: ${BMSTRUCKFEIGN_URL:localhost:8076}
   QmsTruckFeign:
-    url: ${QMSTRUCKFEIGN_URL:localhost:8087}
+    url: ${QMSTRUCKFEIGN_URL:localhost:8047}
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:localhost:8086}
   TmsTruckFeign: