Merge branch 'refs/heads/lihui/feature-20250623144029-金币前端lihui' into milestone-20250623-金币前端

# Conflicts:
#	src/views/consume/addCoinConsume.vue

src/views/consume/addCoinConsume.vue

@@ -84,11 +84,9 @@ const getAdminData = async function () {
     });
     adminData.value = result;
     addConsume.value.adminId = adminData.value.id;
-<<<<<<< HEAD
+
     addConsume.value.name = adminData.value.adminName;
-=======
-    addConsume.value.name = adminData.value.name;
->>>>>>> zhangrenyuan/feature-20250623164058-金币前端
+
     console.log("请求成功", result);
     console.log("用户信息", adminData.value);
   } catch (error) {