Browse Source

'焦炭派车'

HUJIANGUO 3 years ago
parent
commit
3fb0576619
1 changed files with 0 additions and 1 deletions
  1. 0 1
      src/main/resources/application-prod.yml

+ 0 - 1
src/main/resources/application-prod.yml

@@ -6,7 +6,6 @@ spring:
     username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-<<<<<<< HEAD
     name: dil-ams-api-dev
 
  openfeign: