fix合并冲突

src/views/consume/addCoinConsume.vue

@@ -84,7 +84,9 @@ const getAdminData = async function () {
     });
     adminData.value = result;
     addConsume.value.adminId = adminData.value.id;
+
     addConsume.value.name = adminData.value.adminName;
+
     console.log("请求成功", result);
     console.log("用户信息", adminData.value);
   } catch (error) {
@@ -221,7 +223,7 @@ function resetForm() {
     permanentGold: null,
     taskGold: null,
     remark: "",
-    adminId: adminData.value.adminId,
+    adminId: adminData.value.id,
     adminName: adminData.value.adminName,
   };