Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into...

fengxiang

2018-03-20 a1c7c8f01bc80853b0b591bbb1742e7be9c72f5c

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

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

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

@NgModule({
  imports: [