Merge branch 'master' into master-任务组

陈昶聿

13 分钟以前 6e3d0a2097a4d841e941a84ec54780a67eb60ba1

 ruoyi-admin/pom.xml

@@ -185,6 +185,12 @@
            <artifactId>postgresql</artifactId>
            <version>42.6.0</version> <!-- 请根据需要选择最新版本 -->
        </dependency>
        <!--oracle-->
        <dependency>
            <groupId>com.oracle.database.jdbc</groupId>
            <artifactId>ojdbc8</artifactId>
            <scope>runtime</scope>
        </dependency>
    </dependencies>
    <build>
        <plugins>