Merge remote-tracking branch 'origin/master' into dev-auto-sign

zhengyiming

2 天以前 1b3d015ebf23534ed2911be8e7ae552793ebfb66

 src/views/TaskManage/TaskManageList.vue

@@ -154,7 +154,9 @@
      serviceFee: {
        type: 'money',
        formatter: (row) => {
          return `${row.serviceFee}${EnumBillingMethodUnitText[row.billingMethod]}`;
          return row.billingMethod === EnumBillingMethod.Face
            ? ''
            : `${row.serviceFee}${EnumBillingMethodUnitText[row.billingMethod]}`;
        },
      },
    },