Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2

fengxiang

2018-07-31 a2bd66a59a51c84100474d1ce3eb79d7ed3b754e

 src/app/layout/default/header/header.component.html

@@ -81,7 +81,7 @@
            <header-user></header-user>
        </li>
        <li class="hidden-xs">
            <button nz-button [nzType]="'primary'" (close)="backToWin">
            <button nz-button [nzType]="'primary'" (click)="backToWin()">
                    <span>返回</span>
            </button>
        </li>