From bb0c7d3c6cecdfd04f3a191b59a1b9a8853d69e2 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 15 Jun 2020 16:12:47 +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/opration/businessRecords.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/businessRecords.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/businessRecords.html
index b8ca7d6..af3527c 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/businessRecords.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/businessRecords.html
@@ -125,7 +125,7 @@
                 { field: 'recordIp', width: 180, sort: true, title: 'IP' },
                 { field: 'recordTitle', width: 300, sort: true, title: '标题' },
                 { field: 'id', width: 250, align: 'center', toolbar: '#businessRecords-table-bar', sort: true, title: '查看详情' },// 0就诊数据 1筛查
-                { field: 'createTime', width: 250, sort: true, title: '时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy年MM月dd日 HH:mm:ss')}}</div>" }
+                { field: 'createTime', width: 250, sort: true, title: '时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd HH:mm')}}</div>" }
             ]]
         });
 

--
Gitblit v1.8.0