Merge branch 'dev' of ssh://192.168.5.5:29418/web/crm-web into dev

zuozhengqing

2023-11-06 2fb4239e828bcfa9711ce4cecc4b942767621d62

 src/views/sales/masterOrder/index.vue

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