??

3 days ago · c9efe4f4cd
1 changed files with 0 additions and 4 deletions
--- 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-金币前端