From 3022fdb1f9828f441a18bf61fd965375ae5a5ca7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 10 十二月 2025 17:52:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/business/activity.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/src/views/business/activity.vue b/admin/src/views/business/activity.vue
index a998206..9d202a1 100644
--- a/admin/src/views/business/activity.vue
+++ b/admin/src/views/business/activity.vue
@@ -126,7 +126,7 @@
         endtime: '',
         type: 1 //绫诲瀷0鍟嗗娲诲姩 1骞冲彴娲诲姩 2鎺㈠簵 3璧勮
       },
-      
+
       activityStatus: [
         // 0鏈紑濮� 1鎶ュ悕涓�,2鎶ュ悕缁撴潫,3娲诲姩杩涜涓�,4娲诲姩宸茬粨鏉�
         { label: '鏈紑濮�', id: 0 },
@@ -166,7 +166,7 @@
       this.search()
     },
     shopDetail(row) {
-      
+
     }
   },
 }

--
Gitblit v1.9.3