From 92c1b817719743fbc254deb9909d6f16ffd95d3e Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 13 Apr 2020 15:48:13 +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/contract.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html
index 1c049c2..b30cde1 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html
@@ -150,7 +150,7 @@
                     { field: 'proEndtime', width: 180, title: '结束时间',templet:function(d){
                         return new Date(d.proEndtime).dateFormat("yyyy/MM/dd hh:mm:ss");
                     } },
-                    { field: 'createTime', width: 160, sort: true, title: '创建时间' },
+                    { field: 'createTime', width: 160, sort: true, title: '创建时间' }
                 ]]
             });
             }

--
Gitblit v1.8.0