diff --git a/.env.development b/.env.development
index f7a654f..ae28029 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,5 @@
NODE_ENV = 'development'
VITE_NOW_TYPE = 'dist'
# Base API
-<<<<<<< HEAD
VITE_APP_BASE_URL='http://192.168.1.13:8546'
# VITE_APP_BASE_URL='https://erp.lihaink.cn'
-=======
-# VITE_APP_BASE_URL='http://192.168.1.22:8546'
-VITE_APP_BASE_URL='https://erp.lihaink.cn'
->>>>>>> 6aebc6e263b88ef40931c5e19a0a6a833a75e1e8
diff --git a/src/views/data/supplier/audit/detail.vue b/src/views/data/supplier/audit/detail.vue
index f96f2a5..a4c7dd6 100644
--- a/src/views/data/supplier/audit/detail.vue
+++ b/src/views/data/supplier/audit/detail.vue
@@ -12,7 +12,7 @@
{{ formData.supplier.service_phone }}
- {{ formData.supplier?.storeAddress }}
+ {{ formData.supplier?.mer_address }}
{{ dataJSON.company_name }}
diff --git a/src/views/data/supplier/supplier/detail.vue b/src/views/data/supplier/supplier/detail.vue
index c2a80ba..5b6613b 100644
--- a/src/views/data/supplier/supplier/detail.vue
+++ b/src/views/data/supplier/supplier/detail.vue
@@ -1,6 +1,7 @@