From 593f5693ef703f5d60aa85abaa22ca8b6fb5a631 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Mon, 21 Apr 2025 15:31:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81-?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/indexconfig/addgoods.vue | 4 ----
 1 file changed, 4 deletions(-)

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修改