Merge remote-tracking branch 'origin/master'

zss

2023-11-24 c825c201696b2eeb3e2faccda7f17f376ac1e097

 src/views/basic/location/index.vue

@@ -198,7 +198,7 @@
          {
            minWidth: '200',
            prop: 'ifsLocation',
            label: 'ERP库位',
            label: 'IFS库位',
            sort: true,
            isTrue: false,
            isSearch: true,