Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-17 42819fb733c99c39b705edcc022e5801f28e8cb0

 src/views/sales/refundForm/DetailRefundForm.vue

@@ -137,8 +137,8 @@
      showSummary: {
        show: true,
        total: true,
        sumProp: ["other1", "other2", "other3", "other4"],
        mergeNumber: 3
        sumProp: ["amount", "price", "total"],
        mergeNumber: 1
      },
      productTableList: {}
    }