'代码合并'

2022-03-03 17:22:13 +08:00
parent f14efa2612 ae0c4aea12
commit 441cb6ddcb
42 changed files with 1357 additions and 39 deletions
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -15,6 +15,7 @@
    <packaging>jar</packaging>

    <dependencies>
+<<<<<<< HEAD


        <dependency>
@@ -28,6 +29,8 @@
            <version>7.4.0</version>
        </dependency>

+=======
+>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-properties-migrator</artifactId>