Merge branch 'dev' into test

src/views/warehouseManagement/stockLedger/components/item-search.vue

@@ -68,7 +68,6 @@
                 <el-option
                   label="物品维度"
                   value="1"
-                  v-if="type === 'products'"
                 >
                 </el-option>
                 <el-option label="批次维度" value="2"> </el-option>