yangjun
/
sadjv3_user
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

This commit is contained in:
Mr.jiang 2024-07-04 15:18:49 +08:00
parent c8544716f5
commit c1054a2500
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
my/order/pay.vue
View File

@ -2018,11 +2018,6 @@
padding: 29rpx; padding: 29rpx;
} }
.content{ .content{
<<<<<<< .mine
=======
// padding-bottom: 140rpx;
>>>>>>> .theirs
padding-top: 20px; padding-top: 20px;
width: 100%; width: 100%;
background-color: #f7f7f7; background-color: #f7f7f7;