From 56eba9cded865648465bc2c5815d47441e0457b1 Mon Sep 17 00:00:00 2001
From: sxq <812980466@qq.com>
Date: 星期二, 22 六月 2021 15:35:52 +0800
Subject: [PATCH] Merge branch 'dev' of D:\idea\RuoYi-Vue-Plus with conflicts.
---
ruoyi-common/pom.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index ff210d5..39c7b8e 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -146,10 +146,10 @@
<artifactId>redisson-spring-boot-starter</artifactId>
</dependency>
- <!--jaxb-->
+ <!-- dynamic-datasource 澶氭暟鎹簮-->
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>com.baomidou</groupId>
+ <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
</dependency>
</dependencies>
--
Gitblit v1.9.3