diff --git a/vue3-project/src/views/tabbar/wrj/Edituser.vue b/vue3-project/src/views/tabbar/wrj/Edituser.vue
index 199383e0f9ffaaa3d9343fb22467eabc990621ae..4d71a097d36384a07294d8e0d6819ed5f310df37 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 {