From 4097603afb95411d728604286b29e5dfaa78794e Mon Sep 17 00:00:00 2001
From: dulingling <dll19920503@qq.com>
Date: Fri, 5 Jun 2020 10:00:15 +0800
Subject: [PATCH] =?UTF-8?q?upd:=E5=8F=91=E7=A5=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 2 +-
 src/main/resources/templates/app/invoice.html | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 026efc8a6..161b185d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.24</version>
+    <version>2.3.25</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.3.0</jib-maven-plugin.version>
diff --git a/src/main/resources/templates/app/invoice.html b/src/main/resources/templates/app/invoice.html
index 78efd3064..35ab771a2 100644
--- a/src/main/resources/templates/app/invoice.html
+++ b/src/main/resources/templates/app/invoice.html
@@ -255,14 +255,13 @@
         <span class="spanfoot-value" th:text="${parmerters.totalSettledAmount}"></span>
     </div>
     <div>
-        <span class="spanfoot-title">Service Fee for RoyalPay:</span>
-        <span class="spanfoot-value" th:text="${parmerters.royalpay_gst}"></span>(GST Inclusive)
+        <span class="spanfoot-title">Merchant Service Fee:</span>
+        <span class="spanfoot-value" th:text="${parmerters.total_fee}"></span>(GST Inclusive)
     </div>
     <div>
-        <span class="spanfoot-title">Service fee for Mini Program:</span>
-        <span class="spanfoot-value" th:text="${parmerters.incremental_gst}"></span>(GST Inclusive)
+        <span class="spanfoot-title">GST:</span>
+        <span class="spanfoot-value" th:text="${parmerters.gst}"></span>
     </div>
-
 </div>
 </body>
 </html>