Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

Fixiaobai

2023-12-11 5d64e2573f5e0b9dc06891cf441c02b057310e1c

 src/views/basic/location/index.vue

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