Merge remote-tracking branch 'origin/master'

zss

2023-12-14 fd5845de8d0200ae55710e07e19fc31e3e67b422

 src/views/plan/manufacturingorder/routing.vue

@@ -96,15 +96,15 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '100',
            prop: 'name',
            label: '工艺名称',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '100',
          //   prop: 'name',
          //   label: '工艺名称',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // 工艺类型
          {
            minWidth: '120',