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

fengxiang

2018-03-20 a1c7c8f01bc80853b0b591bbb1742e7be9c72f5c

 src/app/layout/default/header/components/user.component.ts

@@ -35,7 +35,7 @@
            token: 'nothing',
            name: 'Admin',
            avatar: './assets/img/zorro.svg',
            email: 'cipchk@qq.com'
            email: 'admin@qq.com'
        };
        this.tokenService.set(token);
    }