From 951c39dd069030a37b4d718b859dfb118269e433 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期一, 15 十一月 2021 17:57:25 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM

---
 PAMapp/assets/ts/api/consultant.ts |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/PAMapp/assets/ts/api/consultant.ts b/PAMapp/assets/ts/api/consultant.ts
index 16a86b9..d37c3b8 100644
--- a/PAMapp/assets/ts/api/consultant.ts
+++ b/PAMapp/assets/ts/api/consultant.ts
@@ -42,7 +42,11 @@
     const headers = {
         Authorization: 'Bearer ' + localStorage.getItem('id_token')
     }
+<<<<<<< HEAD
     return service.post('/appointment/customer/create', data, {headers})
+=======
+    return service.post('/appointment/customer/create', data ,{headers})
+>>>>>>> b7de9faedf2a3e21c77c4ab3fc645ef01ac549cf
 }
 
 //憿批�底蝝啗���

--
Gitblit v1.8.0