From 0f4df6c351d87054ded6bd54f0c6b9f6253ea56f Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 14 Mar 2021 20:42:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole_new' into whole_new

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

diff --git a/src/main/resources/i18n/messages_en_US.properties b/src/main/resources/i18n/messages_en_US.properties
index add0045..1b5f99a 100644
--- a/src/main/resources/i18n/messages_en_US.properties
+++ b/src/main/resources/i18n/messages_en_US.properties
@@ -140,6 +140,7 @@
 member_service_0096=Transfer fail
 member_service_0097=Payment method already exists
 member_service_0098=Please select another account
+member_service_0099=The nickname can only be modified once
 
 order_service_0001=Wrong parameter value
 order_service_0002=Not logged in
@@ -230,6 +231,7 @@
 documentary_service_0016=The trader has been set not to follow orders
 documentary_service_0017=Please change the contract to separate margin mode
 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
 
 uploadFile_controller_0001=Upload failed
 

--
Gitblit v1.9.1