From 6a63fab816cc0dfc73e0c62debb86f8cc0df2ea9 Mon Sep 17 00:00:00 2001
From: zry <18990852002@163.com>
Date: Tue, 8 Jul 2025 17:16:33 +0800
Subject: [PATCH 1/2] new modified

---
 .env.development | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.env.development b/.env.development
index 0783298..8c353a3 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,5 @@
-<<<<<<< HEAD
 # VITE_API_BASE='https://hwjb.homilychart.com/admin'
 VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
-# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
-=======
-VITE_API_BASE='https://hwjb.homilychart.com/admin'
->>>>>>> 3f86315c763df2cadd42226e5bbc74ea2917bf86
 # VITE_API_BASE='http://192.168.8.242:8081/'
 VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
 

From c9e53ebb3c0feac1683c998f77ff6acfc846efc6 Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Tue, 8 Jul 2025 17:32:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E5=85=85=E5=80=BC=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/audit/rechargeAudit.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/audit/rechargeAudit.vue b/src/views/audit/rechargeAudit.vue
index 2c46ff6..9bc24fb 100644
--- a/src/views/audit/rechargeAudit.vue
+++ b/src/views/audit/rechargeAudit.vue
@@ -194,7 +194,6 @@ const rechargeAudit = ref({
   startTime: "", // 充值时间开始
   endTime: "", // 充值时间结束
   market: "", // 地区
-  auditStatus: "0"
 })
 
 // 搜索对象
@@ -349,7 +348,7 @@ const resetSearch = function () {
     startTime: "",
     endTime: "",
     market: "",
-    // auditStatus: "0"
+    auditStatus: rechargeAudit.value.auditStatus
   }
   getTime.value = []
   getRecharge()