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

src/app/routes/sys-setting/components/organization-management/api-auth-modal/api-auth-modal.component.html

@@ -1,12 +1,8 @@
 <nz-card [nzLoading]="loadingInfo" [nzBordered]="false">
-    <se-container se-container="1">
-        <se label="接口权限" required [labelWidth]="120">
-            <app-menu-tree #menu (changeData)="getData($event)" [appId]="params.appId"
-                [isAuthorityIdDTOList]="roleInfoData.authority || []"
-                [authorityAssistId]="roleInfoData.authorityAssistId || []">
-            </app-menu-tree>
-        </se>
-    </se-container>
+    <app-menu-tree #menu (changeData)="getData($event)" [appId]="params.appId"
+        [isAuthorityIdDTOList]="roleInfoData.authority || []"
+        [authorityAssistId]="roleInfoData.authorityAssistId || []">
+    </app-menu-tree>
 </nz-card>
 
 <div class="modal-footer">

src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts

@@ -152,9 +152,7 @@ export class ETCInvoicedListComponent implements OnInit {
       { title: '订单号', index: 'billCode', width: 200 },
       {
         title: '开票状态',
-        index: 'invoicingStatus',
-        type: 'enum',
-        enum: { '0': '待开票', '1': '开票中', '2': '已开票', '3': '开票失败' },
+        index: 'invoicingStatusLabel',
         width: 120
       },
       { title: '订单类型', index: 'billTypeLabel', width: 120 },