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

zuozhengqing

2023-10-17 4e8e3e78c35ca2ff4a31f865561f0d5c4d89dad9

 src/views/sales/subOrder/index.vue

@@ -119,7 +119,7 @@
        infomation: {}
      },
      showSummary: {
        show: true,
        show: false,
        sumProp: ["productAmount"],
        mergeNumber: 6
      },