Merge branch 'pc2.1'

src/views/user/SetUserInfo.vue

@@ -32,7 +32,7 @@ const handleAvatarSuccess=(e)=>{
         res=e
     }
     if(res.code===200){
-        formData.avatar=e.data
+        formData.avatar=res.data
     }
 }