diff --git a/gold-system/.env.development b/gold-system/.env.development
index 7b92bd0..cc08b56 100644
--- a/gold-system/.env.development
+++ b/gold-system/.env.development
@@ -1,2 +1,5 @@
-VITE_API_BASE='http://54.251.137.151:10704/'
+#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_prod'
+# VITE_API_BASE='http://54.251.137.151:10704/'
+# VITE_API_BASE='http://192.168.8.232:8080/'
\ No newline at end of file
diff --git a/gold-system/.env.test b/gold-system/.env.test
index 7b92bd0..cc08b56 100644
--- a/gold-system/.env.test
+++ b/gold-system/.env.test
@@ -1,2 +1,5 @@
-VITE_API_BASE='http://54.251.137.151:10704/'
+#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_prod'
+# VITE_API_BASE='http://54.251.137.151:10704/'
+# VITE_API_BASE='http://192.168.8.232:8080/'
\ No newline at end of file
diff --git a/gold-system/src/views/audit/rechargeAudit.vue b/gold-system/src/views/audit/rechargeAudit.vue
index 27ab247..c058caf 100644
--- a/gold-system/src/views/audit/rechargeAudit.vue
+++ b/gold-system/src/views/audit/rechargeAudit.vue
@@ -553,10 +553,7 @@ const handleSortChange = (column) => {
 // 精网号去空格
 const trimJwCode = () => {
   if (rechargeVo.value.jwcode) {
-<<<<<<< HEAD
-=======
     // 去除字符串两端的空格
->>>>>>> 3ffaf69421c1702f88dc3c7f947def06c9cc99c5
     rechargeVo.value.jwcode = rechargeVo.value.jwcode.replace(/\s/g, ''); 
   }
 }
diff --git a/gold-system/src/views/goldBeen/goldenBeenBalance.vue b/gold-system/src/views/goldBeen/goldenBeenBalance.vue
index 60bedad..c31b7fc 100644
--- a/gold-system/src/views/goldBeen/goldenBeenBalance.vue
+++ b/gold-system/src/views/goldBeen/goldenBeenBalance.vue
@@ -35,19 +35,11 @@
     </el-form>
   </div>
   <div class="table-box">
-<<<<<<< HEAD
-    <p>
-      现有金豆：&nbsp;&nbsp;付费金豆：{{ getObj.jinbiBuy }}&nbsp;&nbsp;免费金豆：{{
-        getObj.jinbiFree
-      }}&nbsp;&nbsp;历史消费：{{ getObj.jinbiCostTotal }}
-    </p>
-=======
     <div>
       现有金豆：&nbsp;&nbsp;付费金豆：{{ getObj.jinbiBuy }}&nbsp;&nbsp;免费金豆：{{
         getObj.jinbiFree
       }}&nbsp;&nbsp;历史消费：{{ getObj.jinbiCostTotal }}
     </div>
->>>>>>> 3ffaf69421c1702f88dc3c7f947def06c9cc99c5
     <el-table
       :data="tableData"
       style="width: 100%"
diff --git a/gold-system/src/views/goldBeen/goldenBeenDetail.vue b/gold-system/src/views/goldBeen/goldenBeenDetail.vue
index 00e7d6a..cef3dc3 100644
--- a/gold-system/src/views/goldBeen/goldenBeenDetail.vue
+++ b/gold-system/src/views/goldBeen/goldenBeenDetail.vue
@@ -434,7 +434,7 @@ const getCount = async () => {
       url: '/dou/getTotal',
       data: {
         jwcode: detailY.value.jwcode,
-        //deptName: detailY.value.deptName,
+        deptName: detailY.value.deptName,
         startTime: detailY.value.createTime[0],
         endTime: detailY.value.createTime[1],
         orderNo: detailY.value.orderNo,