From 71e9f98a7c5b0288b6d149985c07c39c31c6da7b Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Thu, 18 Jun 2020 15:50:15 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform 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