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

src/views/supermarketerp/supermarketSpu/index.vue

@@ -103,7 +103,7 @@
 				<el-table-column prop="costPrice" label="成本单价(元)" show-overflow-tooltip width="120">
 					<template #default="{ row }">{{ displayPrice(row.costPrice, "") }}</template>
 				</el-table-column>
-				<el-table-column prop="stock" label="总库存" show-overflow-tooltip />
+				<el-table-column prop="stock" label="剩余总库存" show-overflow-tooltip />
 				<!-- <el-table-column prop="giveIntegral" label="赠送积分" show-overflow-tooltip /> -->
 				<!-- <el-table-column prop="merchantId" label="商户编号" show-overflow-tooltip /> -->
 				<!-- <el-table-column prop="specification" label="规格" show-overflow-tooltip /> -->