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 | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index c6275c2..39c7b8e 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -53,12 +53,6 @@
<artifactId>jackson-databind</artifactId>
</dependency>
- <!-- 闃块噷JSON瑙ｆ瀽鍣� -->
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- </dependency>
-
<!-- excel宸ュ叿 -->
<dependency>
<groupId>org.apache.poi</groupId>
@@ -152,6 +146,12 @@
<artifactId>redisson-spring-boot-starter</artifactId>
</dependency>
+ <!-- dynamic-datasource 澶氭暟鎹簮-->
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+ </dependency>
+
</dependencies>
</project>
--
Gitblit v1.9.3