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

疯狂的狮子li

2021-10-28 f5f16aac96772c109658b5ae1b48874008e0959a

 pom.xml

@@ -143,6 +143,13 @@
                <version>${satoken.version}</version>
            </dependency>

            <!-- jdk11 缺失依赖 jaxb-->
            <dependency>
                <groupId>com.sun.xml.bind</groupId>
                <artifactId>jaxb-impl</artifactId>
                <version>${jaxb.version}</version>
            </dependency>

            <!-- dynamic-datasource 多数据源-->
            <dependency>
                <groupId>com.baomidou</groupId>
@@ -334,16 +341,6 @@
        <module>ruoyi-oss</module>
    </modules>
    <packaging>pom</packaging>


    <dependencies>
        <!-- jdk11 缺失依赖 jaxb-->
        <dependency>
            <groupId>com.sun.xml.bind</groupId>
            <artifactId>jaxb-impl</artifactId>
            <version>${jaxb.version}</version>
        </dependency>
    </dependencies>

    <build>
        <plugins>