Merge remote-tracking branch 'origin/develop' into develop

沈斌

2018-02-02 18df46f1bbdf5f3aa29aedb828ae2bc9d33e0f90

 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>