diff --git a/src/views/managerecharge/rate.vue b/src/views/managerecharge/rate.vue
index 3788d08..5aa0977 100644
--- a/src/views/managerecharge/rate.vue
+++ b/src/views/managerecharge/rate.vue
@@ -157,9 +157,6 @@ import request from '@/util/http'
 .unit {
   margin-left: 10px;
 }
-<<<<<<< HEAD
-</style>
-=======
 
 .el-card {
   padding: 0px;
@@ -177,4 +174,3 @@ import request from '@/util/http'
   hyphens: auto;
 }
 </style>
->>>>>>> milestone-20250623-金币前端