From ba6460a475bfa0673ba02779841f6a8f829d6d8d Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Thu, 16 Aug 2018 14:34:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=B9=E5=AE=9A=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E6=98=AF=E5=90=A6=E5=8F=B6=E5=AD=90?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=94=BE=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
index 0e729150d..1354a18e7 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
@@ -219,7 +219,7 @@
 														</div>
 														<div for="groupId"></div>
 													</div> 
-													<%-- <div class="form-group">
+													 <div class="form-group">
 														<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
 														<div class="col-md-4">
 															<form:select path="isLeaf"  class="form-control leafChange">
@@ -228,7 +228,7 @@
 																		</c:forEach>				                    
 															</form:select>
 														</div>
-													</div>  --%>
+													</div>  
 													 <%-- <div class="form-group">
 														<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="cfg_type"/>:</label>
 														<div class="col-md-4">

From e1a035762a7abb4d44d1fbc6fec1bb814c35b130 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Thu, 16 Aug 2018 16:24:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E5=8D=95=E8=AF=8D=EF=BC=9A=E6=9D=A5=E5=87=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/messages/message_zh_CN.properties | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 27bb7b07f..724a32047 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -314,7 +314,6 @@ config_describe=\u914D\u7F6E\u63CF\u8FF0
 match_area=\u5339\u914D\u533A\u57DF
 key_word=\u5173\u952E\u5B57
 block_type=\u7BA1\u63A7\u7C7B\u578B
-letter=\u6765\u51FD
 whether_area_block=\u533A\u57DF\u7BA1\u63A7\u8303\u56F4
 classification=\u5206\u7C7B
 label=\u6807\u7B7E
@@ -986,7 +985,7 @@ isp_report=\u8FD0\u8425\u5546\u5C40\u70B9\u62A5\u8868
 ip_multiplex_policy=IP\u590D\u7528\u7B56\u7565
 target_ip_protect=\u6297DDOS\u653B\u51FB 
 ip_multiplex_pool_config=IP\u590D\u7528\u5730\u5740\u6C60
-letter=\u61D2\u6C49
+letter=\u6765\u51FD
 show_more=\u5C55\u793A\u66F4\u591A
 #===============dashboard begin===================================
 dashboard=\u7EDF\u8BA1\u56FE\u8868