Merge remote-tracking branch 'origin/master'

angular.json

@@ -33,8 +33,7 @@
             "scripts": [
               "node_modules/jquery/dist/jquery.js",
               "node_modules/popper.js/dist/umd/popper.js",
-              "node_modules/bootstrap/dist/js/bootstrap.js",
-              "node_modules"
+              "node_modules/bootstrap/dist/js/bootstrap.js"
             ]
           },
           "configurations": {

src/app/app.module.ts

@@ -6,7 +6,6 @@ import {AppRoutingModule} from './app-routing.module';
 import {AppComponent} from './app.component';
 // 登陆
 import {LoginComponent} from './account/login/login.component';
-import { CookieService } from 'ngx-cookie-service';
 // 响应式表单
 import {ReactiveFormsModule} from '@angular/forms';
 // 国际化支持
@@ -41,7 +40,7 @@ export function HttpLoaderFactory(http: HttpClient) {
       }
     })
   ],
-  providers: [CookieService],
+  providers: [],
   bootstrap: [AppComponent]
 })
 export class AppModule {