From a04d76dc568b4a13455ea6ca4ae2a92e6387736d Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 25 Nov 2020 16:36:14 +0800
Subject: [PATCH] Merge branch 'development' into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html |    3 +++
 1 files changed, 3 insertions(+), 0 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 8613f39..cdf70b6 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
@@ -85,6 +85,9 @@
                     },
                     {
                         field: 'contractTime', width: 120, title: '合同签订时间', templet: function (d) {
+                            if(d.contractTime==null){
+                                return new Date(d.createTime).dateFormat("yyyy/MM/dd");
+                            }
                             return new Date(d.contractTime).dateFormat("yyyy/MM/dd");
                         }
                     },

--
Gitblit v1.8.0