front/merchapp
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 冲突问题

Browse Source
This commit is contained in:
qijq 2025-07-28 01:58:03 +08:00
parent 868a749cc7
commit 8d36524457
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java-mall-app-shop-admin/pages/warehouse/manage/productList.vue
View File

@ -194,9 +194,7 @@
</view> </view>
</view> </view>
<view class="productList-bottom"> <view class="productList-bottom">
<<<<<<< Updated upstream =======
<view class="bottom-item" @click="skipuClassify">分类管理</view> <view class="bottom-item" @click="skipuClassify">分类管理</view>
>>>>>>> Stashed changes
<view class="bottom-item"> <view class="bottom-item">
<u-icon class="u-icon" name="grid" size="16" color="#222"></u-icon> <u-icon class="u-icon" name="grid" size="16" color="#222"></u-icon>
<view class="bottom-item-name">分类管理</view> <view class="bottom-item-name">分类管理</view>