Merge branch 'master' into develop-2

src/app/app.module.ts

@@ -3,6 +3,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common'
 import { HttpClientModule } from '@angular/common/http'
+import { NgZorroAntdModule } from 'ng-zorro-antd';
 
 import { AppRoutingModule } from './app-routing.module'
 
@@ -31,6 +32,7 @@ import { LoginAuthService } from './services/login-auth.service';
         CommonModule,
         HttpClientModule,
         ToastModule,
+        NgZorroAntdModule,
         AppRoutingModule
     ],
     providers: [