Merge remote-tracking branch 'origin/master'

zss

2023-12-14 fd5845de8d0200ae55710e07e19fc31e3e67b422

 src/views/technology/document/index.vue

@@ -239,7 +239,7 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          {
          /* {
            minWidth: '120',
            prop: 'projectType',
            label: '项目类别',
@@ -271,7 +271,7 @@
            isSearch: true,
            searchInfoType: 'text'
          },

 */
          // 描述
          {
            minWidth: '120',