Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin

zhengyiming

9 天以前 a6c44ba04f4f88acb057ea672c8d1d20e86dcd55

Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin

 auto-imports.d.ts

 src/views/TaskManage/TaskManageList.vue

@@ -150,7 +150,12 @@
      settlementStatus: { type: 'enum', valueEnum: EnumTaskSettlementStatusText },
      beginTime: { type: 'date', format: 'YYYY-MM-DD' },
      endTime: { type: 'date', format: 'YYYY-MM-DD' },
      serviceFee: { type: 'money' },
      serviceFee: {
        type: 'money',
        formatter: (row) => {
          return `${row.serviceFee}${EnumBillingMethodUnitText[row.billingMethod]}`;
        },
      },
    },
  }
);