From 5fe9c379f0cc696568a0db249026a1e8a3b02a5a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期二, 15 九月 2020 13:52:39 +0800
Subject: [PATCH] Merge branch 'gdasrs' of https://gitee.com/luxiaotao1123/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 d8c9acf..d657de3 100644
--- a/src/main/webapp/static/js/operateLog/operateLog.js
+++ b/src/main/webapp/static/js/operateLog/operateLog.js
@@ -22,7 +22,7 @@
             {field: 'id', title: 'ID', sort: true,align: 'center', width: 80}
             ,{field: 'userId$', align: 'center',title: '鐢ㄦ埛'}
             ,{field: 'action', align: 'center',title: '鎿嶄綔鍐呭'}
-            ,{field: 'ip', align: 'center',title: '瀹㈡埛绔疘P'}
+            ,{field: 'ip', align: 'center',title: '搴撲綅鍚嶇О绔疘P'}
             ,{field: 'request', align: 'center',title: '璇锋眰鏁版嵁'}
             ,{field: 'response', align: 'center',title: '鍝嶅簲鏁版嵁'}
             ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}

--
Gitblit v1.9.1