From 8d365244577f8c9f6c15389d690731561f6ca254 Mon Sep 17 00:00:00 2001
From: qijq <624811160@qq.com>
Date: Mon, 28 Jul 2025 01:58:03 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 java-mall-app-shop-admin/pages/warehouse/manage/productList.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/java-mall-app-shop-admin/pages/warehouse/manage/productList.vue b/java-mall-app-shop-admin/pages/warehouse/manage/productList.vue
index 5bcdbce..0a2a19a 100644
--- a/java-mall-app-shop-admin/pages/warehouse/manage/productList.vue
+++ b/java-mall-app-shop-admin/pages/warehouse/manage/productList.vue
@@ -194,9 +194,7 @@
       </view>
     </view>
     <view class="productList-bottom">
-      <<<<<<< Updated upstream =======
       <view class="bottom-item" @click="skipuClassify">分类管理</view>
-      >>>>>>> Stashed changes
       <view class="bottom-item">
         <u-icon class="u-icon" name="grid" size="16" color="#222"></u-icon>
         <view class="bottom-item-name">分类管理</view>