From a8ab74fdbc4e590a4c9778d447538c3bc30925e4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 24 八月 2020 08:54:44 +0800
Subject: [PATCH] Merge branches 'gdasrs' and 'jsasrs' of http://192.168.2.250:9527/r/zy-asrs into gdasrs
---
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