From df67c9d38a75b1e7c1931bf26c4107ce1272e886 Mon Sep 17 00:00:00 2001
From: mukaiu <mukaiu@live.cn>
Date: Tue, 4 Sep 2018 18:30:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?#33=20=E4=BF=AE=E6=94=B9=20=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F-=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84-=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E9=83=A8=E9=97=A8=20=E5=BC=B9=E7=AA=97=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/src/main/resources/templates/admin/organ/index.html   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contact-center/app/src/main/resources/templates/admin/organ/index.html b/contact-center/app/src/main/resources/templates/admin/organ/index.html
index fd126485..d8ce0d10 100644
--- a/contact-center/app/src/main/resources/templates/admin/organ/index.html
+++ b/contact-center/app/src/main/resources/templates/admin/organ/index.html
@@ -3,7 +3,7 @@
 		<h1 class="site-h1" style="background-color:#FFFFFF;">
 			组织机构
 			<span style="float:right;">
-				<button class="layui-btn layui-btn-small green" href="/admin/organ/add.html<#if organData>?parent=${organData.id!''}</#if>" id="areaadd" data-toggle="ajax" data-height="400" data-width="650" data-title="创建新用户">
+				<button class="layui-btn layui-btn-small green" href="/admin/organ/add.html<#if organData>?parent=${organData.id!''}</#if>" id="areaadd" data-toggle="ajax" data-height="400" data-width="650" data-title="创建新部门">
 					创建部门
 				</button>
 			</span>
@@ -19,7 +19,7 @@
 			<#if organData??>${organData.name!''}<#else>默认机构</#if><#if userList??>（${userList?size!''}）</#if>
 			<span style="float:right;">
 				<#if organData??>
-				<button class="layui-btn layui-btn-small green" href="/admin/organ/seluser.html?organ=${organData.id!''}" data-toggle="ajax" data-width="750" data-title="创建新用户">
+				<button class="layui-btn layui-btn-small green" href="/admin/organ/seluser.html?organ=${organData.id!''}" data-toggle="ajax" data-width="750" data-title="添加用户到当前部门">
 					添加用户到当前部门
 				</button>
 				<button class="layui-btn layui-btn-primary layui-btn-small" href="/admin/organ/area.html?id=${organData.id}" data-toggle="ajax" data-width="450" data-height="400" data-title="地区设置">

From 59258ec5da0ce6d8bd9ac725337b238230cc12fb Mon Sep 17 00:00:00 2001
From: mukaiu <mukaiu@live.cn>
Date: Tue, 4 Sep 2018 18:33:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?#28=20=E7=A7=BB=E9=99=A4=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/apps/desktop/include/left.html   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contact-center/app/src/main/resources/templates/apps/desktop/include/left.html b/contact-center/app/src/main/resources/templates/apps/desktop/include/left.html
index 1680947b..04f094bb 100644
--- a/contact-center/app/src/main/resources/templates/apps/desktop/include/left.html
+++ b/contact-center/app/src/main/resources/templates/apps/desktop/include/left.html
@@ -66,7 +66,7 @@
 		  <div class="layui-tab-content">
 			<div class="layui-tab-item layui-show">
 				<ul class="ukewo-btn-group">
-					<li <#if subtype == 'content'>class="layui-this"</#if>>
+					<!-- <li <#if subtype == 'content'>class="layui-this"</#if>>
 						<a href="/apps/content.html" class="ukefu-bt">
 							<i class="kfont ukewo-btn">&#xe717;</i>
 							<div class="ukefu-bt-text">
@@ -91,7 +91,7 @@
 								</div>
 							</div>
 						</a>
-					</li>
+					</li> -->
 					<!-- 
 					<li>
 						<a href="" class="ukefu-bt">