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

沈斌

2018-03-13 9c9b8250b973eea72f6970e1ceb46facca9f0a99

 src/app/routes/users/users.module.ts

@@ -18,7 +18,7 @@
  }
];

const COMPONENTS_NOROUNT = [ UserInstallerEditComponent,AlarmUserEditComponent ];
const COMPONENTS_NOROUNT = [ UserInstallerEditComponent, AlarmUserEditComponent ];

@NgModule({
  imports: [