From 293d5042a773595ded45bdc9c69c4555ab9c5dd5 Mon Sep 17 00:00:00 2001 From: 侯瑞军 <411269194@kidgrow.com> Date: Thu, 14 May 2020 18:39:24 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html index 14f3f96..bcdfd79 100644 --- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html +++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html @@ -72,11 +72,12 @@ return d.sex == 0 ? "男" : "女" }, width: 100 }, - { - sort: true, width: 200, templet: function (d) { - return util.toDateString(d.createTime); - }, title: '创建时间' - }, + // { + // sort: true, width: 200, templet: function (d) { + // return util.toDateString(d.createTime); + // }, title: '创建时间' + // }, + { field: 'createTime', width: 250, sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd HH:mm')}}</div>" }, { field: 'enabled', width: 100, sort: true, templet: '#user-tpl-state', title: '状态' }, { fixed: 'right', align: 'center', toolbar: '#user-table-bar', title: '操作', width: 300 } ]], -- Gitblit v1.8.0