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

侯瑞军

2020-04-02 0e2879d8e3110b777bcdcff9d7e8e8a44bf95e7d

 pom.xml

@@ -156,6 +156,7 @@
            <version>${javax.activatio.version}</version>
        </dependency>
        <!-- jaxb模块引用 - end -->

    </dependencies>

    <dependencyManagement>