From cb54546259ccc3dc624c5722402aad238b321677 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期一, 28 六月 2021 13:54:53 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- ruoyi-common/pom.xml | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index ff210d5..e2cbd39 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -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