From 9219e18a9b2fb06b95b5c881b057d3fde7270ca3 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Thu, 25 Feb 2021 10:28:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole_new' into whole_new

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

diff --git a/src/main/resources/i18n/messages_zh_CN.properties b/src/main/resources/i18n/messages_zh_CN.properties
index 335a593..8fddc1f 100644
--- a/src/main/resources/i18n/messages_zh_CN.properties
+++ b/src/main/resources/i18n/messages_zh_CN.properties
@@ -227,6 +227,9 @@
 documentary_service_0013=请平仓后，在申请
 documentary_service_0014=当前状态不能进行跟单
 documentary_service_0015=当前有跟单，请取消再申请
+documentary_service_0016=该交易员已设置不能跟单
+documentary_service_0017=请将合约修改为分仓保证金模式
+documentary_service_0018=正在跟单中，无法调整为全仓保证金模式
 
 uploadFile_controller_0001=上传失败
 

--
Gitblit v1.9.1