From 752f59b3603a6028176b111f6ff1759dc5c021f8 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Tue, 6 Mar 2018 11:26:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=BF=AE=E6=94=B9=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/messages/message_en.properties    | 2 +-
 src/main/resources/messages/message_ru.properties    | 2 +-
 src/main/resources/messages/message_zh_CN.properties | 2 +-
 src/main/webapp/WEB-INF/views/systemService/form.jsp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 756422b52..e88811496 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -146,7 +146,7 @@ fill_loginPassWord=Please fill in the passWord
 
 #==========yewuliexingguanli begin=====================
 act=action
-black=black
+block=block
 monitor=monitor
 block_white_list=block white list
 monitor_white_list=monitor white list
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index 87b77a81d..e706d890d 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -146,7 +146,7 @@ fill_loginPassWord=Please fill in the passWord
 
 #==========yewuliexingguanli begin=====================
 act=action
-black=black
+block=block
 monitor=monitor
 block_white_list=block white list
 monitor_white_list=monitor white list
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 34f007de2..e8cb48922 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -145,7 +145,7 @@ fill_loginPassWord=\u8bf7\u586b\u5199\u767b\u5f55\u5bc6\u7801
 
 #==========yewuliexingguanli begin=====================
 act=\u52a8\u4f5c
-black=\u963b\u65ad
+block=\u963b\u65ad
 monitor=\u76d1\u6d4b
 block_white_list=\u5c01\u5835\u767d\u540d\u5355
 monitor_white_list=\u76d1\u6d4b\u767d\u540d\u5355
diff --git a/src/main/webapp/WEB-INF/views/systemService/form.jsp b/src/main/webapp/WEB-INF/views/systemService/form.jsp
index 74c2916cf..90a456523 100644
--- a/src/main/webapp/WEB-INF/views/systemService/form.jsp
+++ b/src/main/webapp/WEB-INF/views/systemService/form.jsp
@@ -161,7 +161,7 @@
 					'<span class="child-label"><font color="red">*</font>'+'<spring:message code="table_type"/>'+':</span> ' + 
 					'<span> ' +
 						'<select class="child-required" name="tableType" onchange="autoServiceId()"> ' +
-							'<option value="">'+'<spring:message code="selelct"/>'+'</option>' +
+							'<option value="">'+'<spring:message code="select"/>'+'</option>' +
 							'<option value="1">IP</option>' +
 							'<option value="2">'+'<spring:message code="string"/>'+'</option>' +
 							'<option value="3">'+'<spring:message code="number"/>'+'</option>' +