update 冲突问题

2025-07-28 01:58:03 +08:00 · 2025-07-28 01:58:03 +08:00 · 8d36524457
commit 8d36524457
parent 868a749cc7
1 changed files with 0 additions and 2 deletions
--- 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>