Merge remote-tracking branch 'origin/dev' into dev

侯瑞军

2020-04-03 f57c1111d78b3442b2a9e2eaea255157cdcb9574

 pom.xml

@@ -156,11 +156,7 @@
            <version>${javax.activatio.version}</version>
        </dependency>
        <!-- jaxb模块引用 - end -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-devtools</artifactId>
            <optional>true</optional>
        </dependency>

    </dependencies>

    <dependencyManagement>