'修改bug'

src/main/resources/application-dev.yml

@@ -5,9 +5,5 @@ spring:
     username: dilusr
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-<<<<<<< HEAD
     name: dil-column-data-dev
-=======
-    name: dil-dil-cd-api
->>>>>>> c947bec98cdb7ac10b240a40275d31a5c64658d5
 

src/main/resources/application-prod.yml

@@ -5,8 +5,4 @@ spring:
     username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-<<<<<<< HEAD
     name: dil-column-data-prod
-=======
-    name: dil-dil-cd-api
->>>>>>> c947bec98cdb7ac10b240a40275d31a5c64658d5