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

zuozhengqing

2023-10-16 5233bff9efb1830ea9b13661944637ee6d22e364

 src/views/sales/masterOrder/index.vue

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