From 18df46f1bbdf5f3aa29aedb828ae2bc9d33e0f90 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 02 Feb 2018 11:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/app/routes/routes.module.ts |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/app/routes/routes.module.ts b/src/app/routes/routes.module.ts
index 67e88d4..c89de5e 100644
--- a/src/app/routes/routes.module.ts
+++ b/src/app/routes/routes.module.ts
@@ -1,3 +1,4 @@
+import { UserLoginComponent } from './passport/login/login.component';
 import { DateService } from '@business/services/util/date.service';
 import { _HttpClient } from '@delon/theme';
 import { NgModule } from '@angular/core';
@@ -30,6 +31,7 @@
         DashboardAnalysisComponent,
         DashboardMonitorComponent,
         DashboardWorkplaceComponent,
+        UserLoginComponent
     ],
     providers: [
         _HttpClient,

--
Gitblit v1.8.0