Merge branch 'weiyu' into develop

src/app/shared/components/captcha/captcha.module.ts

@@ -0,0 +1,11 @@
+import { NgModule } from '@angular/core';
+
+import { CaptchaComponent } from './captcha.component';
+
+const COMPONENTS = [CaptchaComponent];
+
+@NgModule({
+  declarations: COMPONENTS,
+  exports: COMPONENTS
+})
+export class CaptchaModule {}

src/app/shared/components/captcha/index.ts

@@ -1,2 +1,3 @@
 export * from './captcha.component';
 export * from './dun.helper';
+export * from './captcha.module';

src/app/shared/shared-third.module.ts

@@ -5,6 +5,7 @@ import { apiConf } from '@conf/api.conf';
 import { NgxTinymceModule } from 'ngx-tinymce';
 import { environment } from '@env/environment';
 
+
 const TinyMce = NgxTinymceModule.forRoot({
   baseURL: 'assets/tinymce/',
   config: {

src/app/shared/shared.module.ts

@@ -37,6 +37,7 @@ import { ImageListModule } from './components/imagelist';
 import { DictSelectComponent } from './components/dict-select';
 import { PipeModule } from './pipes';
 import { AccountDetailComponent } from './components/account-detail/account-detail.component';
+import { CaptchaModule } from './components/captcha';
 import { rebateTableModule } from './components/rebate-table';
 
 const MODULES = [
@@ -53,6 +54,7 @@ const MODULES = [
   ImageListModule,
   PipeModule,
   rebateTableModule,
+  CaptchaModule,
   ...PRO_SHARED_MODULES
 ];
 // #endregion