From f5f16aac96772c109658b5ae1b48874008e0959a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 28 十月 2021 10:56:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
pom.xml | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 632c534..28e7efa 100644
--- a/pom.xml
+++ b/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>
--
Gitblit v1.9.3