From 7f133cb8fc080b64ab8002b35f04b646f95a6abf Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 27 May 2021 16:37:38 +0800
Subject: [PATCH] Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc

---
 src/main/resources/i18n/messages_en_US.properties |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/i18n/messages_en_US.properties b/src/main/resources/i18n/messages_en_US.properties
index 1b5f99a..b3ce513 100644
--- a/src/main/resources/i18n/messages_en_US.properties
+++ b/src/main/resources/i18n/messages_en_US.properties
@@ -233,6 +233,13 @@
 documentary_service_0018=In documentary, cannot adjust to full position margin mode
 documentary_service_0019=The follower has a documentary contract and cannot kick out
 
+activity_service_0001=Please pass the real name authentication first
+activity_service_0002=Currently invalid
+activity_service_0003=Cannot activate repeatedly
+activity_service_0004=The activity has ended
+activity_service_0005=Can't get it if you don't meet the conditions
+activity_service_0006=Received successfully, it has been issued to currency account
+
 uploadFile_controller_0001=Upload failed
 
 result_success_msg=Operation success
@@ -254,3 +261,5 @@
 
 unknown_type=Unknown type
 
+loading_type=loading
+

--
Gitblit v1.9.1