From 936bb39145eee86530f61d3345f8125ddd778225 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 13 Mar 2018 16:35:07 +0800
Subject: [PATCH] 冲突修正

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

diff --git a/src/app/routes/systems/systems.module.ts b/src/app/routes/systems/systems.module.ts
index eae0bff..d1f3d49 100644
--- a/src/app/routes/systems/systems.module.ts
+++ b/src/app/routes/systems/systems.module.ts
@@ -47,7 +47,7 @@
     OrganizationConfigComponent,
     OrganizationListComponent
   ],
-  providers: [ToolsService, SensorsService,OrganizationService, _HttpClient, FormBuilder, AreacodeService],
+  providers: [ToolsService, SensorsService, OrganizationService, _HttpClient, FormBuilder, AreacodeService],
   entryComponents: COMPONENTS_NOROUNT
 })
 export class SystemsModule { }

--
Gitblit v1.8.0