diff --git a/src/views/product/indexconfig/addgoods.vue b/src/views/product/indexconfig/addgoods.vue
index 2575f5e..87850a6 100644
--- a/src/views/product/indexconfig/addgoods.vue
+++ b/src/views/product/indexconfig/addgoods.vue
@@ -758,10 +758,6 @@ const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) return;
   await formEl.validate(async (valid, fields) => {
     if (valid) {
-<<<<<<< HEAD
-
-=======
->>>>>>> 2602916201f0e12ac5cb51e5a88d69cfaaeb7baf
       // 第一张图片作为封面图
       ruleForm.coverImg = ruleForm.images[0];
       // 规格id修改