From 124766132b01645c9942f4cadd7cb88953bfc728 Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang>
Date: Wed, 20 Dec 2017 14:00:10 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

---
 src/app/routes/users/installer/installer.component.html |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/routes/users/installer/installer.component.html b/src/app/routes/users/installer/installer.component.html
index 8827729..ceab058 100644
--- a/src/app/routes/users/installer/installer.component.html
+++ b/src/app/routes/users/installer/installer.component.html
@@ -79,8 +79,8 @@
       <td nz-td>{{i.weixin}}</td>
       <td nz-td>{{i.password}}</td>
       <td nz-td>{{i.organizationId}}</td>
-      <td nz-td>{{i.createTime | _date}}</td>
-      <td nz-td>{{i.expireTime | _date}}</td>
+      <td nz-td>{{format_date(i.createTime)}}</td>
+      <td nz-td>{{format_date(i.expireTime)}}</td>
       <td nz-td>
         <a (click)="edit(i)">������</a>
         <span nz-table-divider></span>

--
Gitblit v1.8.0