记得上下班打卡 | git大法好,push需谨慎

Commit 8eb0711f authored by 胡佳晨's avatar 胡佳晨

Merge remote-tracking branch 'origin/dev_20111115' into dev_20111115

parents bb26885a 8d160315
......@@ -106,9 +106,9 @@
{
field: 'createdAt',
title: '时间',
formatter: function (value, row, index) {
return $.common.dateFormat(startTime, 'yyyy-MM-dd HH:mm:ss');
}
// formatter: function (value, row, index) {
// return $.common.dateFormat(value, 'yyyy-MM-dd HH:mm:ss');
// }
},
// {
// field: 'eventAmt',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment