From 184bb04bc2ca9991eacb88ab1709f6284db71075 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 24 八月 2020 10:26:44 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
pom.xml | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9ef7c4f..117ac33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,6 +30,8 @@
<poi.version>3.17</poi.version>
<velocity.version>1.7</velocity.version>
<jwt.version>0.9.0</jwt.version>
+ <mybatis-plus.version>3.3.0</mybatis-plus.version>
+ <hutool.version>5.1.0</hutool.version>
</properties>
<!-- 渚濊禆澹版槑 -->
@@ -64,6 +66,12 @@
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>${pagehelper.boot.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mybatis</groupId>
+ <artifactId>mybatis</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- 鑾峰彇绯荤粺淇℃伅 -->
@@ -138,14 +146,30 @@
<artifactId>jjwt</artifactId>
<version>${jwt.version}</version>
</dependency>
-
+
<!--楠岃瘉鐮� -->
<dependency>
<groupId>com.github.penggle</groupId>
<artifactId>kaptcha</artifactId>
<version>${kaptcha.version}</version>
</dependency>
-
+
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-boot-starter</artifactId>
+ <version>${mybatis-plus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-extension</artifactId>
+ <version>${mybatis-plus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ <version>${hutool.version}</version>
+ </dependency>
+
<!-- 瀹氭椂浠诲姟-->
<dependency>
<groupId>com.ruoyi</groupId>
--
Gitblit v1.9.3