From 1d5345f92dbd4aac2b5f68265921bb2529a71b8e Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Tue, 27 Oct 2020 14:16:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pom.xml | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7f29603..e62b831 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
<easypoi.version>4.1.0</easypoi.version>
<poi.version>4.1.0</poi.version>
<druid-starter>1.1.10</druid-starter>
- <mybatis-plus-boot-starter.version>3.3.1</mybatis-plus-boot-starter.version>
+ <mybatis-plus-boot-starter.version>3.4.0</mybatis-plus-boot-starter.version>
<p6spy.version>3.8.6</p6spy.version>
<swagger.version>2.9.2</swagger.version>
<guava.version>28.1-jre</guava.version>
@@ -92,6 +92,8 @@
<docker.image.prefix>kidgrow</docker.image.prefix>
<!--docker harbor地址-->
<docker.repostory>182.92.99.224:8081</docker.repostory>
+ <com.belerweb.pinyin4j.version>2.5.1</com.belerweb.pinyin4j.version>
+ <net.coobird.thumbnailator.version>0.4.11</net.coobird.thumbnailator.version>
</properties>
<dependencies>
@@ -156,6 +158,16 @@
<version>${javax.activatio.version}</version>
</dependency>
<!-- jaxb模块引用 - end -->
+ <dependency>
+ <groupId>com.belerweb</groupId>
+ <artifactId>pinyin4j</artifactId>
+ <version>${com.belerweb.pinyin4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.coobird</groupId>
+ <artifactId>thumbnailator</artifactId>
+ <version>${net.coobird.thumbnailator.version}</version>
+ </dependency>
</dependencies>
--
Gitblit v1.8.0