From f91a65805c27c2bb01eb94f1ec9c2afa07a44020 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 11 Aug 2020 11:29:20 +0800
Subject: [PATCH] Merge branch 'master' into follow

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

diff --git a/src/main/resources/i18n/messages_zh_CN.properties b/src/main/resources/i18n/messages_zh_CN.properties
index 0fdc300..bbb1439 100644
--- a/src/main/resources/i18n/messages_zh_CN.properties
+++ b/src/main/resources/i18n/messages_zh_CN.properties
@@ -41,6 +41,7 @@
 member_service_0009=手机号不能为空
 member_service_0010=发送成功
 
+documentary_service_0011=取消成功
 member_service_0011=发送失败
 member_service_0012=验证码已失效，请重新请求
 member_service_0013=验证码有误
@@ -222,6 +223,10 @@
 home_service_0013=修改成功，请登录
 home_service_0014=不存在该手机号码，请进行注册登录
 
+documentary_service_0013=请平仓后，在申请
+documentary_service_0014=当前状态不能进行跟单
+documentary_service_0015=当前有跟单，请取消再申请
+
 uploadFile_controller_0001=上传失败
 
 result_success_msg=操作成功

--
Gitblit v1.9.1