From ce434eeed482311873a014acd825ada0a97e7d90 Mon Sep 17 00:00:00 2001 From: tianyi <13521030702@163.com> Date: Tue, 31 Mar 2026 09:42:10 +0800 Subject: [PATCH] 11 --- package1/group/groupBuySingle.vue | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/package1/group/groupBuySingle.vue b/package1/group/groupBuySingle.vue index dfb0199..1c52f23 100644 --- a/package1/group/groupBuySingle.vue +++ b/package1/group/groupBuySingle.vue @@ -56,13 +56,10 @@ 公告:{{shopItem.remark}} -<<<<<<< HEAD - -======= - ->>>>>>> 946d5f7b5bc979d55f8619021f5de61f9daefccb + + -