From ca2a6d455604056ce628f296911f6abac85a7598 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 15 七月 2025 09:54:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ytflWms' into ytflWms

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

diff --git a/src/main/webapp/static/js/user/user.js b/src/main/webapp/static/js/user/user.js
index 0e06c7e..dfc5871 100644
--- a/src/main/webapp/static/js/user/user.js
+++ b/src/main/webapp/static/js/user/user.js
@@ -24,7 +24,7 @@
         cols: [[
             {type: 'checkbox'}
             // ,{field: 'hostName', align: 'center',title: '鎺堟潈鍟嗘埛', templet: '#hostTpl', width: 140}
-            // ,{field: 'nickname', align: 'center',title: '鐢ㄦ埛鍚�'}
+            ,{field: 'nickname', align: 'center',title: '鐢ㄦ埛鍚�'}
             ,{field: 'username', align: 'center',title: '鐧诲綍璐︽埛'}
             ,{field: 'mobile', align: 'center',title: '鎵嬫満鍙�'}
             // ,{field: 'deptName', align: 'center',title: '鎵�灞為儴闂�'}

--
Gitblit v1.9.1