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>