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

Fixiaobai

2023-12-15 fc6ed7861e7771b16452f8e88a5c67d9b0d9c9c6

 src/views/basic/location/index.vue

@@ -194,7 +194,7 @@
            optList: () => {
              return this.getWarehouseLocGroupList()
            }
          },
          }/* ,
          // ERP库位
          {
            minWidth: '200',
@@ -204,7 +204,7 @@
            isTrue: false,
            isSearch: true,
            searchInfoType: 'text'
          }
          } */
        ],
        toolbar: [
          {