Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into dev

yangfeng

2023-10-16 53d082fd0bac1421d5cf5f1033c61af22a0f5346

 src/views/sales/masterOrder/index.vue

@@ -111,7 +111,7 @@
        infomation: {}
      },
      showSummary: {
        show: true,
        show: false,
        sumProp: ["money"],
        mergeNumber: 5
      },