From c5d6c4c5e7651330ab97d2ac445c3d27159ce264 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 29 Jul 2020 17:31:22 +0800
Subject: [PATCH] Merge branch 'master' into follow

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

diff --git a/src/main/resources/i18n/messages_en_US.properties b/src/main/resources/i18n/messages_en_US.properties
index 1ae789b..fc356e7 100644
--- a/src/main/resources/i18n/messages_en_US.properties
+++ b/src/main/resources/i18n/messages_en_US.properties
@@ -222,4 +222,22 @@
 home_service_0013=Modification succeeded, please log in
 home_service_0014=The mobile number does not exist, please register and log in
 
-uploadFile_controller_0001=Upload failed
\ No newline at end of file
+uploadFile_controller_0001=Upload failed
+
+result_success_msg=Operation success
+result_fail_msg=Operation failed
+
+common_verify_code=Code Error Or Invalided
+common_verify_code_exist=Code existed
+
+illegal_symbol=Illegal Symbol
+illegal_type=Illegal Type
+
+entrust_price_judge_more=The entrusted open price cannot be higher than the market price
+entrust_price_judge_less=The entrusted open price cannot be lower than the market price
+entrust_order_not_exist=Order does not exist
+cancellation_success=Cancellation Success
+cancellation_fail=Cancellation Fail
+
+submit_repeat=Do not repeat submission
+

--
Gitblit v1.9.1