合并冲突

pom.xml

@@ -182,7 +182,7 @@
     </dependencies>
     <build>
         <plugins>
-                        <!-- 自动生成代码文件-->
+<!--                         自动生成代码文件-->
 <!--            <plugin>-->
 <!--                <groupId>com.steerinfo</groupId>-->
 <!--                <artifactId>generator-maven-plugin</artifactId>-->
@@ -194,7 +194,8 @@
 <!--                    &lt;!&ndash;包名&ndash;&gt;-->
 <!--                    <targetPackage>com.steerinfo.dil</targetPackage>-->
 <!--                    <tables>-->
-<!--                        <table></table>-->
+<!--                        <table>
+</table>-->
 <!--                    </tables>-->
 <!--                </configuration>-->
 <!--                <executions>-->

src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: dil
-    username: Dil123789
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dal-dazhou-join-api