From 33c1865bf18b3f46d4ced94352f9634f0e7d66b3 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 15 Apr 2025 12:42:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/views/modules/sys/user/empUserList.html | 2 +-
 .../resources/views/modules/demo/demoDataGridEditGrid.html     | 3 ++-
 .../resources/views/modules/demo/demoDataGridGroupGrid.html    | 3 ++-
 .../src/main/resources/views/modules/test/testDataList.html    | 2 +-
 .../src/main/resources/views/modules/test/testTreeList.html    | 3 ++-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html
index 3885914c..1920f548 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html
@@ -139,7 +139,7 @@ $('#dataGrid').dataGrid({
 		{header:'${text("状态")}', name:'status', index:'a.status', width:60, align:"center", frozen:true, formatter: function(val, obj, row, act){
 			return js.getDictLabel("#{@DictUtils.getDictListJson('sys_status')}", val, '未知', true);
 		}},
-		{header:'${text("操作")}', name:'actions', width:140, formatter: function(val, obj, row, act){
+		{header:'${text("操作")}', name:'actions', width:143, formatter: function(val, obj, row, act){
 			var actions = [];
 			//# if(hasPermi('sys:empUser:edit')){
 				actions.push('<a href="${ctx}/sys/empUser/form?userCode='+row.userCode+'&op=edit" class="btnList" title="${text("编辑用户")}"><i class="fa icon-note"></i></a>&nbsp;');
diff --git a/modules/test/src/main/resources/views/modules/demo/demoDataGridEditGrid.html b/modules/test/src/main/resources/views/modules/demo/demoDataGridEditGrid.html
index 66d06745..d9ec3f6d 100644
--- a/modules/test/src/main/resources/views/modules/demo/demoDataGridEditGrid.html
+++ b/modules/test/src/main/resources/views/modules/demo/demoDataGridEditGrid.html
@@ -7,8 +7,9 @@
 			</div>
 			<div class="box-tools pull-right">
 				<a href="#" class="btn btn-default" id="btnSearch" title="查询"><i class="fa fa-filter"></i> 查询</a>
-				<a href="#" id="dataGridAddRowBtn" class="btn btn-primary"><i class="fa fa-plus"></i> 增行</a>
 				<a href="#" id="btnGetData" class="btn btn-default"><i class="fa fa-hand-lizard-o"></i> 获取表格数据</a>
+				<a href="#" id="dataGridAddRowBtn" class="btn btn-primary"><i class="fa fa-plus"></i> 增行</a>
+				<a href="#" class="btn-setting" id="btnSetting" title="${text('设置')}"><i class="fa icon-settings"></i></a>
 			</div>
 		</div>
 		<div class="box-body">
diff --git a/modules/test/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html b/modules/test/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html
index b4be5ec0..8213f42e 100644
--- a/modules/test/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html
+++ b/modules/test/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html
@@ -7,10 +7,11 @@
 			</div>
 			<div class="box-tools pull-right">
 				<a href="#" class="btn btn-default" id="btnSearch" title="查询"><i class="fa fa-filter"></i> 查询</a>
+				<a href="${ctx}/demo/dataGrid/stateGrid" class="btn btn-default btnTool" title="统计表样例"><i class="fa fa-hand-lizard-o"></i> 统计表样例</a>
 				<% if(hasPermi('test:testData:edit')){ %>
 					<a href="${ctx}/test/testData/form" class="btn btn-primary btnTool" title="新增数据"><i class="fa fa-plus"></i> 新增</a>
 				<% } %>
-				<a href="${ctx}/demo/dataGrid/stateGrid" class="btn btn-default btnTool" title="统计表样例"><i class="fa fa-hand-lizard-o"></i> 统计表样例</a>
+				<a href="#" class="btn-setting" id="btnSetting" title="${text('设置')}"><i class="fa icon-settings"></i></a>
 			</div>
 		</div>
 		<div class="box-body">
diff --git a/modules/test/src/main/resources/views/modules/test/testDataList.html b/modules/test/src/main/resources/views/modules/test/testDataList.html
index cec0aa1c..c32f6e02 100644
--- a/modules/test/src/main/resources/views/modules/test/testDataList.html
+++ b/modules/test/src/main/resources/views/modules/test/testDataList.html
@@ -7,10 +7,10 @@
 			</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>
+				<a href="#" class="btn btn-default" id="btnTrunsTest" title="${text('事务测试')}"><i class="fa fa-refresh"></i> ${text('事务测试')}</a>
 				<% if(hasPermi('test:testData:edit')){ %>
 					<a href="${ctx}/test/testData/form" class="btn btn-primary btnTool" title="${text('新增数据')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
 				<% } %>
-				<a href="#" class="btn btn-default" id="btnTrunsTest" title="事务测试"><i class="fa fa-refresh"></i> 事务测试</a>
 				<a href="#" class="btn-setting" id="btnSetting" title="${text('设置')}"><i class="fa icon-settings"></i></a>
 			</div>
 		</div>
diff --git a/modules/test/src/main/resources/views/modules/test/testTreeList.html b/modules/test/src/main/resources/views/modules/test/testTreeList.html
index 742ebd8f..e141b02d 100644
--- a/modules/test/src/main/resources/views/modules/test/testTreeList.html
+++ b/modules/test/src/main/resources/views/modules/test/testTreeList.html
@@ -11,9 +11,10 @@
 				<a href="#" class="btn btn-default" id="btnExpandTreeNode" title="${text('展开一级')}"><i class="fa fa-angle-double-down"></i> ${text('展开')}</a>
 				<a href="#" class="btn btn-default" id="btnCollapseTreeNode" title="${text('折叠全部')}"><i class="fa fa-angle-double-up"></i> ${text('折叠')}</a>
 				<% if(hasPermi('test:testTree:edit')){ %>
-					<a href="${ctx}/test/testTree/form" class="btn btn-primary btnTool" title="${text('新增数据')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
 					<a href="#" class="btn btn-default" id="btnFixTreeData" title="修复树表数据（包含字段：parentCodes、treeLeaf、treeLevel、treeSorts、treeNames）"><i class="fa fa-refresh"></i> 修复</a>
+					<a href="${ctx}/test/testTree/form" class="btn btn-primary btnTool" title="${text('新增数据')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
 				<% } %>
+				<a href="#" class="btn-setting" id="btnSetting" title="${text('设置')}"><i class="fa icon-settings"></i></a>
 			</div>
 		</div>
 		<div class="box-body">