From 60b58b47cecd7611ad8df2561a84bf0548ad6ad9 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 20 Dec 2017 13:54:45 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend.git 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