Merge remote-tracking branch 'origin/dev' into dev

spring

3 天以前 5709db9dc8d689cdbb7a17842998de185b4a6b91

 src/views/salesManagement/receiptPaymentHistory/index.vue

@@ -101,7 +101,7 @@
  {
    label: "回款金额（元）",
    prop: "receiptPaymentAmount",
    width:150,
    width:200,
    formatData: (params) => {
      return params ? parseFloat(params).toFixed(2) : 0;
    },