返佣

2022-03-21 15:00:21 +08:00
parent 303f74c176
commit 18a4740380
6 changed files with 11 additions and 13 deletions
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
@ -300,14 +300,6 @@ export class InvoiceRequestedComponent {
        otherremarks: {
          type: 'string',
          title: '其他需求',
-<<<<<<< HEAD
-=======
-          enum: [
-            { label: '全部', value: '' },
-            { label: '是', value: true },
-            { label: '否', value: false }
-          ],
->>>>>>> ace758617fd29baf5826fe50da26dfa1b86ae71e
          ui: {
            visibleIf: {
              expand: (value: boolean) => value