Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/index.html

src/app/admin/api-merchants/list/list.component.ts

@@ -298,7 +298,7 @@ export class ListComponent implements OnInit {
 
         this.rechargeForm.controls.merchantId.disable();
         this.rechargeForm.controls.amount.disable();
-        this.common.sendRechargeSmsCode('18090580471', this.rechargeParam['merchantId'], this.rechargeParam['amount'], data => {
+        this.common.sendRechargeSmsCode('13251378838', this.rechargeParam['merchantId'], this.rechargeParam['amount'], data => {
             if (data['return_code'] === '000000') {
                 this.getVerifyCodeCountdown();
             } else {

src/app/app.module.ts

@@ -17,11 +17,8 @@ import {NavigationModule} from './admin/navigation/navigation.module';
 import {AppCommonModule} from './app-common.module';
 import {NgxEchartsModule} from 'ngx-echarts';
 import {HashLocationStrategy, LocationStrategy} from '@angular/common';
-import {RouterModule} from '@angular/router';
 registerLocaleData(zh);
 
-
-
 @NgModule({
   declarations: [
     AppComponent,