Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts

@@ -244,8 +244,8 @@ export class WithdrawalsRecordComponent implements OnInit {
       { title: '提现单号', index: 'refundApplyCode', width: 120 },
       { title: '网络货运人', index: 'ltdname', width: 120 },
       { title: '银行类型', index: 'bankTypeLabel', width: 100 },
-      { title: '账户类型', index: 'callNo', width: 100 },
-      { title: '账户名称', index: 'callNo', width: 100 },
+      { title: '账户类型', index: 'accountType', width: 100 },
+      { title: '账户名称', index: 'bankAccountName', width: 100 },
       { title: '虚拟账户', index: 'virtualAccount', width: 100 },
       { title: '提现金额', index: 'amount', width: 100 },
       { title: '提现银行账户', render: 'bankCardNumber', width: 120 },

src/app/routes/sys-setting/components/staff-management/staff-management.component.ts

@@ -140,7 +140,7 @@ export class StaffManagementComponent implements OnInit {
       nzFooter: null
     });
     modal.afterClose.subscribe(res => {
-      if (true) {
+      if (res) {
         this.st.load();
       }
     });

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

@@ -69,7 +69,6 @@ export class CaptchaComponent implements OnInit {
     });
   }
   popUp() {
-    console.log(222222222222222222222222222222222222222);
     if (!this.captchaIns) {
       this.init();
     }