From 15a00ef4796ef58db072fbfea61209d898a89201 Mon Sep 17 00:00:00 2001
From: LiFeiYv <l16603231051@163.com>
Date: Tue, 14 May 2024 20:52:17 +0800
Subject: [PATCH] lfy

---
 vue3-project/src/views/tabbar/wrj/Edituser.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/vue3-project/src/views/tabbar/wrj/Edituser.vue b/vue3-project/src/views/tabbar/wrj/Edituser.vue
index 199383e..4d71a09 100644
--- a/vue3-project/src/views/tabbar/wrj/Edituser.vue
+++ b/vue3-project/src/views/tabbar/wrj/Edituser.vue
@@ -219,10 +219,6 @@ onMounted(() => {
   .upload-area {
     width: 190px;
     height: 120px;
-<<<<<<< HEAD
-=======
-    background: url("@/assets/bg-upload-box.png");
->>>>>>> 5482309 (最新代码)
     background-size: 100% 100%;
   }
   .upload-img {
-- 
Gitee