diff --git a/gold-system/.env.development b/gold-system/.env.development
index dc8b0a6..e9f1785 100644
--- a/gold-system/.env.development
+++ b/gold-system/.env.development
@@ -1,12 +1,5 @@
-<<<<<<< HEAD
-# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
-#VITE_API_BASE='http://54.251.137.151:10704/'
-# VITE_API_BASE='http://192.168.8.94:8080/'
-VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
-=======
# VITE_API_BASE='http://54.251.137.151:10704/'
# VITE_API_BASE='http://192.168.8.94:8080/'
VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
# VITE_API_BASE='http://54.251.137.151:10704/'
->>>>>>> 229c13b945d0e56e10792208bccfdeed0488bca0
# VITE_API_BASE='http://192.168.8.220:8080/'
diff --git a/gold-system/.env.production b/gold-system/.env.production
index e11dbec..2928d04 100644
--- a/gold-system/.env.production
+++ b/gold-system/.env.production
@@ -1,3 +1,3 @@
# VITE_API_BASE='http://54.251.137.151:10702/'
VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
-
+# VITE_API_BASE='http://192.168.8.220:8080/'
diff --git a/gold-system/src/views/goldBeen/goldenBeenDetail.vue b/gold-system/src/views/goldBeen/goldenBeenDetail.vue
index 8e5f235..25dbd1e 100644
--- a/gold-system/src/views/goldBeen/goldenBeenDetail.vue
+++ b/gold-system/src/views/goldBeen/goldenBeenDetail.vue
@@ -85,10 +85,65 @@