Merge branch 'dev' into test

src/views/warehouseManagement/inventoryAllocation/details.vue

@@ -314,13 +314,13 @@
             minWidth: 100,
             hide: this.infoData.inventoryDimension != 3
           },
-          {
-            prop: 'measureQuantity',
-            label: '计量数量',
-            align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 100
-          },
+          // {
+          //   prop: 'measureQuantity',
+          //   label: '计量数量',
+          //   align: 'center',
+          //   showOverflowTooltip: true,
+          //   minWidth: 100
+          // },
           {
             prop: 'quantity',
             label: '调拨数量',