fix: merge
This commit is contained in:
parent
62fc7055dd
commit
cd2c941466
1 changed files with 1 additions and 5 deletions
|
|
@ -275,10 +275,6 @@ const useUserStore = defineStore('api-user', () => {
|
|||
transactionId?: string;
|
||||
},
|
||||
) {
|
||||
<<<<<<< HEAD
|
||||
const { profileImage, zipCode, ...payload } = data;
|
||||
const res = await api.post<User & { profileImageUploadUrl: string }>(
|
||||
=======
|
||||
const res = await api.get(`/user/${id}/profile-image`, {
|
||||
headers: {
|
||||
'X-Session-Id': flow?.sessionId,
|
||||
|
|
@ -338,7 +334,7 @@ const useUserStore = defineStore('api-user', () => {
|
|||
},
|
||||
) {
|
||||
const { zipCode, ...payload } = data;
|
||||
const res = await api.post<User & { profileImageUploadUrl: string }>(
|
||||
const res = await api.post<User>(
|
||||
'/user',
|
||||
{
|
||||
...payload,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue