Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud

src/views/supermarket/smSpu/index.vue

@@ -61,7 +61,7 @@
 						<dict-tag :options="spu_status" :value="scope.row.status" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="barcode" label="商品条码" width="100px" align="center" show-overflow-tooltip />
+<!--				<el-table-column prop="barcode" label="商品条码" width="100px" align="center" show-overflow-tooltip />-->
 				<el-table-column prop="sort" label="排序" show-overflow-tooltip />
 <!--				<el-table-column prop="giveIntegral" label="赠送积分" show-overflow-tooltip />-->
 				<el-table-column prop="salesCount" label="销量" show-overflow-tooltip />