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_zh_CN.properties |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/i18n/messages_zh_CN.properties b/src/main/resources/i18n/messages_zh_CN.properties
index 8fddc1f..fa50004 100644
--- a/src/main/resources/i18n/messages_zh_CN.properties
+++ b/src/main/resources/i18n/messages_zh_CN.properties
@@ -140,6 +140,7 @@
 member_service_0096=划转失败
 member_service_0097=支付方式已存在
 member_service_0098=请选择其他账户
+member_service_0099=昵称只允许修改一次
 
 order_service_0001=参值有误
 order_service_0002=未登录
@@ -230,6 +231,7 @@
 documentary_service_0016=该交易员已设置不能跟单
 documentary_service_0017=请将合约修改为分仓保证金模式
 documentary_service_0018=正在跟单中，无法调整为全仓保证金模式
+documentary_service_0019=跟随者拥有跟单合约，无法踢出
 
 uploadFile_controller_0001=上传失败
 

--
Gitblit v1.9.1