Merge remote-tracking branch 'origin/master'

86134

2023-11-17 60ea555d8c3a8f4021ca99e8c87224426ccd3f22

 src/views/plan/manufacturingorder/index.vue

@@ -428,8 +428,8 @@
          },
          {
            minWidth: '120',
            prop: 'orderRemark',
            label: '销售订单备注',
            prop: 'remark',
            label: '备注',
            sort: true,
            isTrue: true,
            isSearch: true,