From e9bf5a0070b5fbdf9afd4475adbf51e46f579040 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期四, 17 四月 2025 17:20:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb --- ruoyi-common/src/main/java/com/ruoyi/common/core/domain/Result.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/Result.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/Result.java index 2703c59..37cffe6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/Result.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/Result.java @@ -20,7 +20,7 @@ private int code; - private String msg; + private String message; private T data; @@ -69,7 +69,7 @@ Result<T> apiResult = new Result<>(); apiResult.setCode(code); apiResult.setData(data); - apiResult.setMsg(msg); + apiResult.setMessage(msg); return apiResult; } @@ -83,14 +83,14 @@ this.code = code; } - public String getMsg() + public String getMessage() { - return msg; + return message; } - public void setMsg(String msg) + public void setMessage(String message) { - this.msg = msg; + this.message = message; } public T getData() -- Gitblit v1.9.3