Merge branch 'develop' of ssh://121.40.92.176:29418/screen-frontend into de...

沈斌

2018-03-08 f320f1970e5d80a423f377fb3253628bd1e7f5bf

 src/app/routes/routes-routing.module.ts

@@ -38,7 +38,7 @@
        path: 'passport',
        component: LayoutPassportComponent,
        children: [
            {data:{title:'登录页面'}, path: 'login', component: UserLoginComponent }
            {data: {title: '登录页面'}, path: 'login', component: UserLoginComponent }
        ]
    },    // passport
    {