From 3d9285e5c9571c2781748fdb1c27ab47117910db Mon Sep 17 00:00:00 2001
From: donghaolin <17667510818@163.com>
Date: Thu, 28 Nov 2024 10:25:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=85=E5=80=BC=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/gold-system/src/views/recharge/addRecharge.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/vue/gold-system/src/views/recharge/addRecharge.vue b/vue/gold-system/src/views/recharge/addRecharge.vue
index f3d2011..1d0aa58 100644
--- a/vue/gold-system/src/views/recharge/addRecharge.vue
+++ b/vue/gold-system/src/views/recharge/addRecharge.vue
@@ -7,7 +7,6 @@ import { Plus } from '@element-plus/icons-vue'
 </script>
 
 <template>
-<<<<<<< HEAD
   <div>
     新增充值
   </div>
@@ -84,9 +83,6 @@ import { Plus } from '@element-plus/icons-vue'
 <div>
   
 </div>
-=======
-    <h1>Add Recharge</h1>
->>>>>>> 1779301c1263a097fb8b7b909a618d3670373ff6
 </template>
 
 <style scoped>