Merge remote-tracking branch 'origin/develop' into develop

沈斌

2018-02-02 18df46f1bbdf5f3aa29aedb828ae2bc9d33e0f90

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

@@ -38,7 +38,7 @@
            { path: 'login', component: UserLoginComponent }
        ]
    },
    { path: '**', redirectTo: 'dashboard' }
    { path: '**', redirectTo: 'passport/login' }
];

@NgModule({