From 948d29534c77c12501f4ad6172eeb02d299a2136 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 11 Apr 2022 15:43:32 +0800
Subject: [PATCH 1/2] fix bug

---
 .../routes/order-management/components/risk/risk.component.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts
index 37f05598..dabb3c30 100644
--- a/src/app/routes/order-management/components/risk/risk.component.ts
+++ b/src/app/routes/order-management/components/risk/risk.component.ts
@@ -194,7 +194,7 @@ export class OrderManagementRiskComponent implements OnInit {
           type: 'string',
           ui: {
             widget: 'dict-select',
-            params: { dictKey: 'freight:type' },
+            params: { dictKey: 'bill:type' },
             containsAllLabel: true,
             visibleIf: {
               _$expand: (value: boolean) => value

From f6260bf4c1956ff5276f41cbffd851c478bbdf1f Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Mon, 11 Apr 2022 16:34:31 +0800
Subject: [PATCH 2/2] edit

---
 .../individual-income/individual-income.component.html    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.html b/src/app/routes/tax-management/components/individual-income/individual-income.component.html
index 44f45d7f..dedb0881 100644
--- a/src/app/routes/tax-management/components/individual-income/individual-income.component.html
+++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.html
@@ -14,12 +14,12 @@
   <!-- 搜索表单 -->
   <div nz-row nzGutter="8">
     <div nz-col [nzSpan]="_$expand ? 24 : 18">
-      <sf #sf [schema]="schema" [ui]="{ '*': { spanLabelFixed: 100,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
-        [button]="'none'"></sf>
+      <sf #sf [schema]="schema" [ui]="{ '*': { spanLabelFixed: 100,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}"
+        [compact]="true" [button]="'none'"></sf>
     </div>
     <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.expend-options]="_$expand" class="text-right">
-      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()"
-        acl [acl-ability]="['RiskOrder-Search']">查询</button>
+      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading"
+        (click)="search()">查询</button>
       <button nz-button (click)="resetSF()">重置</button>
       <button nz-button (click)="resetSF()">导出</button>
       <button nz-button nzType="link" (click)="expandToggle()">