Merge remote-tracking branch 'origin/master'

Crunchy

2023-11-18 7c4b02892b24bc2d219217b5f9e352d0eb531c4e

 src/views/plan/customerorder/index.vue

@@ -449,7 +449,7 @@
          {
            minWidth: '100',
            width: '100px',
            prop: 'customerOrderNo',
            prop: 'contractNo',
            label: '合同编号',
            sort: true,
            isTrue: true,