Merge branch 'develop'

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

@@ -18,8 +18,8 @@
         <span th:if="${refuse_description != null}">
             Reasons for rejection：<span th:text="${refuse_description}" style="background-color: yellow"></span>.
         </span>
-        Please submit the following risk materials of merchant PINE
-        <span style="background: #FCE824;">before 29/11/2018(Sydney time). </span>
+        Please submit the following risk materials of merchant <span th:text="${client.short_name}"></span> (<span th:text="${client.client_moniker}"></span>)
+        before <span style="background: #FCE824;" th:text="${reply_date_english}"></span>(Sydney time).
     </p>
 
     <p>1、请提供以下被查单号的小票， 物流单据（如有邮寄产品的情况）， 以及消费者与买家的聊天记录等来佐证被查交易单号。 被查交易单号如下:</p>