Merge branch 'master' of http://39.101.133.168:8807/donghaolin/gold-system

6 months ago · 4add3efaa9
1 changed files with 4 additions and 0 deletions
--- a/vue/gold-system/src/views/recharge/addRecharge.vue
+++ b/vue/gold-system/src/views/recharge/addRecharge.vue
@ -7,6 +7,7 @@ import { Plus } from '@element-plus/icons-vue'
 </script>

 <template>
+<<<<<<< HEAD
  <div>
    新增充值
  </div>
@ -83,6 +84,9 @@ import { Plus } from '@element-plus/icons-vue'
 <div>
  
 </div>
+=======
+    <h1>Add Recharge</h1>
+>>>>>>> 1779301c1263a097fb8b7b909a618d3670373ff6
 </template>

 <style scoped>