fix: merge

This commit is contained in:
puriphatt 2024-09-11 16:51:27 +07:00
parent 62fc7055dd
commit cd2c941466

View file

@ -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,