Merge remote-tracking branch 'origin/master'

Crunchy

2023-11-18 7c4b02892b24bc2d219217b5f9e352d0eb531c4e

 src/views/basic/part/index.vue

@@ -169,7 +169,7 @@
          {
            minWidth: '120',
            prop: 'sunit',
            label: '单位2',
            label: '重量单位',
            sort: true,
            isTrue: true,
            isSearch: true,