From abee95ff7de4b3514022b758044e77793f74896f Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 12 Jun 2020 08:52:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 pom.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6d07065..7f29603 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
         <swagger.mg.ui.version>1.0.6</swagger.mg.ui.version>
         <swagger.butler.version>2.0.1</swagger.butler.version>
         <commons-collections4.version>4.4</commons-collections4.version>
-        <fastjson.version>1.2.62</fastjson.version>
+        <fastjson.version>1.2.70</fastjson.version>
         <httpclient.version>4.5.6</httpclient.version>
         <modle-mapper.version>2.3.4</modle-mapper.version>
         <security-oauth2.version>2.4.0.RELEASE</security-oauth2.version>

--
Gitblit v1.8.0