From 7d96ca8c2956efa56d7527b028126338761cfc8e Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Mon, 15 Dec 2025 17:49:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E8=BF=94=E5=9B=9E=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=EF=BC=8C=E6=95=B0=E6=8D=AE=E7=BB=9F=E4=B8=80=E6=94=BE?=
 =?UTF-8?q?=E5=88=B0putData=E9=87=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../finance/common/controller/AuthController.java  |  2 +-
 .../finance/common/controller/UserController.java  |  4 ++--
 src/main/java/com/zmzm/finance/util/R.java         | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zmzm/finance/common/controller/AuthController.java b/src/main/java/com/zmzm/finance/common/controller/AuthController.java
index 7a04667..2fa5739 100644
--- a/src/main/java/com/zmzm/finance/common/controller/AuthController.java
+++ b/src/main/java/com/zmzm/finance/common/controller/AuthController.java
@@ -35,7 +35,7 @@ public class AuthController {
         }else {
             if (MD5Utils.getSaltverifyMD5(user.getPassword(),userEntity.getPassword())){
                 UserToken userToken = userTokenService.createToken(userEntity.getId());
-                return R.ok("登录成功").put("userToken",userToken);
+                return R.ok("登录成功").putData("userToken",userToken);
             }else {
                 return R.error(500,"密码不正确，请重试");
             }
diff --git a/src/main/java/com/zmzm/finance/common/controller/UserController.java b/src/main/java/com/zmzm/finance/common/controller/UserController.java
index 0d9446e..d76b45b 100644
--- a/src/main/java/com/zmzm/finance/common/controller/UserController.java
+++ b/src/main/java/com/zmzm/finance/common/controller/UserController.java
@@ -34,7 +34,7 @@ public class UserController {
     public R getUserList(@RequestBody Map<String,Object> params){
         Page<User> userList = userService.page(new Page<>(Long.parseLong(params.get("page").toString()),
                 Long.parseLong(params.get("limit").toString())));
-        return R.ok().put("userList",userList);
+        return R.ok().putData("userList",userList);
     }
 
     //新增用户
@@ -56,7 +56,7 @@ public class UserController {
         WumenUser wumenUser = wumenUserService.getById("12301");
         Customer customer = customerService.getOne(new LambdaQueryWrapper<Customer>()
                 .eq(Customer::getCellPhone,"15674886255"));
-        return R.ok().put("wumenUser",wumenUser).put("customer",customer);
+        return R.ok().putData("customer",customer);
     }
 
 
diff --git a/src/main/java/com/zmzm/finance/util/R.java b/src/main/java/com/zmzm/finance/util/R.java
index f90b34e..aab85b4 100644
--- a/src/main/java/com/zmzm/finance/util/R.java
+++ b/src/main/java/com/zmzm/finance/util/R.java
@@ -1,7 +1,9 @@
 package com.zmzm.finance.util;
 
 import lombok.Data;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -66,5 +68,17 @@ public class R extends HashMap<String, Object> {
         super.put(key, value);
         return this;
     }
+
+    public R putData(String key, Object value) {
+        if (!super.containsKey("data")) {
+            super.put("data", new HashMap<>());
+        }
+        Map<String,Object> oldData = (Map<String, Object>) super.get("data");
+        Map<String,Object> map = new HashMap<>();
+        map.put(key,value);
+        oldData.putAll(map);
+        super.put("data", oldData);
+        return this;
+    }
 }