合并冲突提交

This commit is contained in:
lemon橪
2021-12-20 17:35:38 +08:00
2 changed files with 4 additions and 4 deletions

View File

@@ -344,7 +344,7 @@
@queryCart="cartCount()"
:goodsDetail="goodsDetail"
:goodsSpec="goodsSpec"
:isGroup="isGroup"
:isGroup="isGroup"
:id="productId"
v-if="goodsDetail.id"
:pointDetail="pointDetail"