From 85f5b6dbedbca8f99e1ea1b36401a5b59555fe5f Mon Sep 17 00:00:00 2001
From: "xueli.xue" <xueli.xue@dianping.com>
Date: Fri, 24 Feb 2017 19:33:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0RM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                                       | 1 +
 .../main/webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d82ac1b9..fcafb416 100644
--- a/README.md
+++ b/README.md
@@ -728,6 +728,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
 - 9、调度重试机制；
 - 10、报表：当日报表、一周报表、一年报表等等；
 - 11、通讯：hex 通讯调整为 http-rpc 模式；
+- 12、执行器支持手动设置执行地址列表，提供开关切换使用注册地址还是手动设置的地址；
 
 ## 七、其他
 
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl
index 5e1aa863..41533dd0 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobgroup/jobgroup.index.ftl
@@ -33,7 +33,7 @@
 							<h3 class="box-title">执行器列表</h3>&nbsp;&nbsp;
                             <button class="btn btn-info btn-xs pull-left2 add" >+新增执行器</button>
                             &nbsp;&nbsp;&nbsp;&nbsp;
-                            调度中心OnLine:<#if adminAddressList?exists><#list adminAddressList as item><span class="badge bg-green">${item}</span></#list></#if>
+                            调度中心OnLine：<#if adminAddressList?exists><#list adminAddressList as item><span class="badge bg-green">${item}</span></#list></#if>
 						</div>
 			            <div class="box-body">
 			              	<table id="joblog_list" class="table table-bordered table-striped display" width="100%" >