From d814bde01eb91d1544b718463cd31317726bbf6b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 27 十二月 2023 21:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion

---
 src/main/webapp/static/js/operateLog/operateLog.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/static/js/operateLog/operateLog.js b/src/main/webapp/static/js/operateLog/operateLog.js
index bd612d4..d8c9acf 100644
--- a/src/main/webapp/static/js/operateLog/operateLog.js
+++ b/src/main/webapp/static/js/operateLog/operateLog.js
@@ -20,8 +20,8 @@
         cols: [[
             // {type: 'checkbox'}
             {field: 'id', title: 'ID', sort: true,align: 'center', width: 80}
-            ,{field: 'action', align: 'center',title: '璁块棶鍦板潃'}
             ,{field: 'userId$', align: 'center',title: '鐢ㄦ埛'}
+            ,{field: 'action', align: 'center',title: '鎿嶄綔鍐呭'}
             ,{field: 'ip', align: 'center',title: '瀹㈡埛绔疘P'}
             ,{field: 'request', align: 'center',title: '璇锋眰鏁版嵁'}
             ,{field: 'response', align: 'center',title: '鍝嶅簲鏁版嵁'}

--
Gitblit v1.9.1