Merge branch 'develop'

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.87</version>
+    <version>2.3.87-SNAPSHOT</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>

src/main/resources/templates/mail/risk_upload_mail.html

@@ -171,13 +171,13 @@
     </p>
     <dl>
         <dt>The relevant transaction details: (交易详情):</dt>
-        <dd>Order ID: <span th:text="${orderInfo.order_id}"></span></dd>
+        <dd>Order ID: <span th:text="*{orderInfo.order_id}"></span></dd>
-        <dd>Date & Time: <span th:text="${orderInfo.pay_time}"></span></dd>
+        <dd>Date & Time: <span th:text="*{orderInfo.pay_time}"></span></dd>
-        <dd>Card Number: <span th:text="${orderInfo.ext_params.card_alias}"></span></dd>
+        <dd>Card Number: <span th:text="*{orderInfo.ext_params.card_alias}"></span></dd>
-        <dd>Customer Name: <span th:text="${orderInfo.ext_params.name}"></span></dd>
+        <dd>Customer Name: <span th:text="*{orderInfo.ext_params.name}"></span></dd>
-        <dd>Customer Address: <span th:text="${orderInfo.ext_params.address}"></span></dd>
+        <dd>Customer Address: <span th:text="*{orderInfo.ext_params.address}"></span></dd>
-        <dd>Amount: <span th:text="|AUD ${orderInfo.clearing_amount}|"></span></dd>
+        <dd>Amount: <span th:text="|AUD *{orderInfo.clearing_amount}|"></span></dd>
-        <dd>Reason: <span th:text="${description}"></span></dd>
+        <dd>Reason: <span th:text="*{description}"></span></dd>
     </dl>
 
     <p>