From e86e4f95fcca349107237f8f4161b9c91e279af1 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 28 Feb 2018 11:16:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/app/routes/users/alarm-user/alarm-user.component.html | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/app/routes/users/alarm-user/alarm-user.component.html b/src/app/routes/users/alarm-user/alarm-user.component.html
index fca1838..a4158ca 100644
--- a/src/app/routes/users/alarm-user/alarm-user.component.html
+++ b/src/app/routes/users/alarm-user/alarm-user.component.html
@@ -81,7 +81,7 @@
<th nz-th><span>������������</span></th>
<th nz-th>
<span>������������</span>
- <nz-table-sort [(nzValue)]="sortMap.updatedAt" (nzValueChange)="sort('expire_time', $event)"></nz-table-sort>
+ <nz-table-sort [(nzValue)]="sortMap" (nzValueChange)="sort('expire_time', $event)"></nz-table-sort>
</th>
<th nz-th><span>������</span></th>
</tr>
--
Gitblit v1.8.0