From d6ca9e548d9c11be3281de1ddae392e276dc2a3d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 02 七月 2021 09:39:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-common/pom.xml | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index ff210d5..aeafac8 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
- <version>${ruoyi-vue-plus.version}</version>
+ <version>2.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -146,10 +146,15 @@
<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>
+
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
</dependency>
</dependencies>
--
Gitblit v1.9.3