diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx
index 56ca8cef..4af725e7 100644
Binary files a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx and b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx differ
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java
index b25872dd..0a232aa2 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java
@@ -38,7 +38,7 @@ import com.jeesite.modules.sys.service.UserService;
 import com.jeesite.modules.sys.utils.UserUtils;
 
 /**
- * 系统管理员Controller
+ * 租户和系统管理员Controller
  * @author ThinkGem
  * @version 2017-03-26
  */
diff --git a/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html b/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html
index 53b6be1b..84339805 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html
@@ -1,9 +1,9 @@
-<% layout('/layouts/default.html', {title: '系统管理员', libs: ['validate','dataGrid']}){ %>
+<% layout('/layouts/default.html', {title: '租户管理员', libs: ['validate','dataGrid']}){ %>
 <div class="main-content">
 	<div class="box box-main">
 		<div class="box-header with-border">
 			<div class="box-title">
-				<i class="fa icon-badge"></i> ${text(user.isNewRecord ? op == 'addCorp' ? '新增租户管理员' : '新增管理员' : '编辑管理员')}
+				<i class="fa icon-badge"></i> ${text(user.isNewRecord ? '新增管理员' : '编辑管理员')}
 			</div>
 			<div class="box-tools pull-right">
 				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
diff --git a/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html b/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html
index cec4f633..49b849a9 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html
@@ -1,15 +1,15 @@
-<% layout('/layouts/default.html', {title: '系统管理员', libs: ['dataGrid']}){ %>
+<% layout('/layouts/default.html', {title: '租户管理员', libs: ['dataGrid']}){ %>
 <div class="main-content">
 	<div class="box box-main">
 		<div class="box-header">
 			<div class="box-title">
-				<i class="fa icon-badge"></i> ${text('系统管理员')}
+				<i class="fa icon-badge"></i> ${text('租户管理员')}
 			</div>
 			<div class="box-tools pull-right">
 				<a href="#" class="btn btn-default" id="btnSearch" title="${text('查询')}"><i class="fa fa-filter"></i> ${text('查询')}</a>
 				<% if(hasPermi('sys:corpAdmin:edit')){ %>
 					<% if(useCorpModel){ %>
-					<a href="${ctx}/sys/corpAdmin/form?op=addCorp" class="btn btn-default btnTool" title=" ${text('新增租户管理员')}"><i class="fa fa-plus"></i> ${text('新增租户管理员')}</a>
+					<a href="${ctx}/sys/corpAdmin/form?op=addCorp" class="btn btn-default btnTool" title=" ${text('新增管理员')}"><i class="fa fa-plus"></i> ${text('新增管理员')}</a>
 					<% }else{ %>
 					<a href="${ctx}/sys/corpAdmin/form?corpCode_=${user.currentUser.corpCode_}&corpName_=${user.currentUser.corpName_}&op=addAdmin" class="btn btn-default btnTool" title="${text('新增管理员')}"><i class="fa fa-plus"></i> ${text('新增管理员')}</a>
 					<% } %>
@@ -18,19 +18,19 @@
 			</div>
 		</div>
 		<div class="box-body">
-			<#form:form id="searchForm" model="${user}" action="${ctx}/sys/corpAdmin/listData" method="post" class="form-inline "
-					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
-				<div class="form-group">
-					<label class="control-label">${text('登录账号')}：</label>
-					<div class="control-inline">
-						<#form:input path="loginCode" maxlength="100" class="form-control width-90"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label">${text('用户昵称')}：</label>
-					<div class="control-inline">
-						<#form:input path="userName" maxlength="100" class="form-control width-90"/>
-					</div>
+			<#form:form id="searchForm" model="${user}" action="${ctx}/sys/corpAdmin/listData" method="post" class="form-inline "
+					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
+				<div class="form-group">
+					<label class="control-label">${text('登录账号')}：</label>
+					<div class="control-inline">
+						<#form:input path="loginCode" maxlength="100" class="form-control width-90"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">${text('用户昵称')}：</label>
+					<div class="control-inline">
+						<#form:input path="userName" maxlength="100" class="form-control width-90"/>
+					</div>
 				</div>
 				<div class="form-group ${useCorpModel?'':'hide'}">
 					<label class="control-label">${text('租户代码')}：</label>
@@ -49,10 +49,10 @@
 					<div class="control-inline width-90">
 						<#form:select path="status" dictType="sys_user_status" blankOption="true" class="form-control isQuick"/>
 					</div>
-				</div>
-				<div class="form-group">
-					<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
-					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
+				</div>
+				<div class="form-group">
+					<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
+					<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
 				</div>
 			</#form:form>			
 			<table id="dataGrid"></table>