Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into...

fengxiang

2018-01-05 2d4cbcc4f92edbc4f926d9710bdda64520039c2b

 src/app/routes/systems/account/account.component.html

@@ -61,7 +61,7 @@

   <nz-table   #nzTable
            [nzAjaxData]="data"
            [nzLoading]="http.loading"
            [nzLoading]="loading"
            [nzTotal]="total"
            [(nzPageIndex)]="query.pageIndex"
            [nzPageSize]="query.pageSize"
@@ -98,7 +98,7 @@
            <td nz-td>{{account.email}}</td>
            <td nz-td>{{account.weixin}}</td>
            <!-- <td nz-td>{{account.password}}</td> -->
            <td nz-td>{{account.organizationId}}</td>
            <td nz-td>{{account.organization?account.organization.name:account.organizationId}}</td>
            <td nz-td>{{format_date(account.createTime)}}</td>
            <td nz-td>{{format_date(account.expireTime)}}</td>
            <td nz-td>