Merge branch 'dev' into test

src/views/warehouseManagement/stockManagement/components/selectType.vue

@@ -206,8 +206,9 @@
             fixed: 'left'
           },
           {
+            prop: 'brandNum',
             label: '牌号',
-            align: 'brandNum',
+            align: 'center',
             showOverflowTooltip: true
           },
           {