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 b5ea0b94..dbb10536 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/resources/views/modules/sys/user/corpAdminForm.html b/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html index fc03a02a..69d7b331 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']}){ %>
- ${text(user.isNewRecord ? op == 'addCorp' ? '新增租户管理员' : '新增管理员' : '编辑管理员')} + ${text(user.isNewRecord ? '新增管理员' : '编辑管理员')}
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 ff13a2f8..8c139639 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']}){ %>
- ${text('系统管理员')} + ${text('租户管理员')}
${text('查询')} <% if(hasPermi('sys:corpAdmin:edit')){ %> <% if(@Global.getConfigToBoolean('user.useCorpModel', 'false')){ %> - ${text('新增租户管理员')} + ${text('新增管理员')} <% }else{ %> ${text('新增管理员')} <% } %> @@ -18,19 +18,19 @@
- <#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}"> -
- -
- <#form:input path="loginCode" maxlength="100" class="form-control width-90"/> -
-
-
- -
- <#form:input path="userName" maxlength="100" class="form-control width-90"/> -
+ <#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}"> +
+ +
+ <#form:input path="loginCode" maxlength="100" class="form-control width-90"/> +
+
+
+ +
+ <#form:input path="userName" maxlength="100" class="form-control width-90"/> +
@@ -49,10 +49,10 @@
<#form:select path="status" dictType="sys_user_status" blankOption="true" class="form-control isQuick"/>
-
-
- - +
+
+ +