From 36ad9966f0f20efe04f4b9a1b580e601e57e84fb Mon Sep 17 00:00:00 2001
From: duLingLing <dll19920503@qq.com>
Date: Thu, 22 Aug 2019 16:18:10 +0800
Subject: [PATCH] =?UTF-8?q?Upd:=E5=8F=91=E9=80=81=E9=A3=8E=E6=8E=A7?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6,=E5=88=A0=E9=99=A4ip=E6=98=BE=E7=A4=BA,?=
 =?UTF-8?q?=E5=86=85=E9=83=A8=E8=B0=83=E7=94=A8=E4=BF=A1=E6=81=AF=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=8F=8F=E8=BF=B0=E5=86=85=E5=AE=B9=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                 | 2 +-
 src/main/resources/templates/mail/risk_upload_mail.html | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5c69a347d..e30e5564d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.1.24</version>
+    <version>1.1.25</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/resources/templates/mail/risk_upload_mail.html b/src/main/resources/templates/mail/risk_upload_mail.html
index 719540fd0..3cd7b9e38 100644
--- a/src/main/resources/templates/mail/risk_upload_mail.html
+++ b/src/main/resources/templates/mail/risk_upload_mail.html
@@ -100,7 +100,6 @@
             <th style="border: 1.0px solid;border-collapse: collapse;">Platform Transaction ID</th>
             <th style="border: 1.0px solid;border-collapse: collapse;">Order Description</th>
             <th style="border: 1.0px solid;border-collapse: collapse;">Customer ID</th>
-            <th style="border: 1.0px solid;border-collapse: collapse;">IP</th>
             <th style="border: 1.0px solid;border-collapse: collapse;">Total Amount</th>
             <th style="border: 1.0px solid;border-collapse: collapse;">Input Amount</th>
             <th style="border: 1.0px solid;border-collapse: collapse;">Pay Amount</th>
@@ -119,7 +118,6 @@
             <td th:text="${order.system_transaction_id}" style="border: 1.0px solid;border-collapse: collapse;"></td>
             <td th:text="${order.order_description}" style="border: 1.0px solid;border-collapse: collapse;"></td>
             <td th:text="${order.customer_id}" style="border: 1.0px solid;border-collapse: collapse;"></td>
-            <td th:text="${order.customer_ip}" style="border: 1.0px solid;border-collapse: collapse;"></td>
             <td th:text="${order.total_amount}" style="border: 1.0px solid;border-collapse: collapse;"></td>
             <td th:text="${order.display_amount}" style="border: 1.0px solid;border-collapse: collapse;"></td>
             <td th:text="${order.customer_payment_amount}" style="border: 1.0px solid;border-collapse: collapse;"></td>
@@ -132,6 +130,7 @@
         </tr>
         </tbody>
     </table>
+    <p th:if="${description != null}"><span th:text="${description}"></span></p>
     <p>请查收关于被抽查的订单交易的相关信息，并在<span style="background: #FCE824"><span th:text="${reply_date}"></span>下午6：00 (悉尼时间)前</span>将所需材料直接回复该邮件，未能按时提交完整证明材料，支付渠道将被关停，请您务必配合调查。感谢。<br>
         Please find sampled transactions in attachment, and reply required materials to this email <span style="background: #FCE824">before 6:00 pm <span th:text="${reply_date_english}"></span> (AEST).</span> If you can not provide qualified materials on time, the payment channels would be suspended or restricted with amount limit. Please be sure to assist the investigation. Thanks.</p>
     <!--<p>请点击此链接上传所需材料。<a th:href="${uploadUrl}"><span th:text="${uploadUrl}"></span></a><br>-->