From 054dc420c385f7865ef920b36ccfb2bc0bdcefd7 Mon Sep 17 00:00:00 2001
From: yixian <astro.dai@royalpay.com.au>
Date: Tue, 22 Sep 2020 12:14:05 +1000
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=A0=B8=E5=BF=83=E5=8C=85?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                   | 4 ++--
 src/main/resources/application-common.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 327110e37..24d01e480 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>2.2.12</version>
+        <version>2.2.14</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.67</version>
+    <version>2.3.68</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>
diff --git a/src/main/resources/application-common.yml b/src/main/resources/application-common.yml
index e88129b80..84f9dad3b 100644
--- a/src/main/resources/application-common.yml
+++ b/src/main/resources/application-common.yml
@@ -94,7 +94,7 @@ spring:
     port: 587
   thymeleaf:
     mode: HTML
-  http:
+  mvc:
     converters:
       preferred-json-mapper: fastjson
 stockholder: