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

fengxiang

2018-02-02 e3f745b1839f3c3c8be58efb7b81681f4f2d2e4c

 src/app/routes/devices/basic-info/basic-info.component.html

@@ -6,7 +6,7 @@
</div>
<nz-card [nzBordered]="false">
        <div class="mb-md">
                <button nz-button (click)="addOrModify()" [nzType]="'primary'" [nzSize]="'large'">
                <button nz-button (click)="addOrModify($event)" [nzType]="'primary'" [nzSize]="'large'">
                    <i class="anticon anticon-plus"></i><span>新建</span>
                </button>
                <ng-container *ngIf="selectedRows.length > 0"> &nbsp;