From 1270b6717f5e98fb48ab1b3ec7a3d15a7f52b877 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期二, 05 七月 2022 09:57:19 +0800 Subject: [PATCH] !194 魔法值优化 Merge pull request !194 from zendwang/dev --- ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java index 8fa4a64..7a24202 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java @@ -38,23 +38,23 @@ private T data; public static <T> R<T> ok() { - return restResult(null, SUCCESS, null); + return restResult(null, SUCCESS, "鎿嶄綔鎴愬姛"); } public static <T> R<T> ok(T data) { - return restResult(data, SUCCESS, null); + return restResult(data, SUCCESS, "鎿嶄綔鎴愬姛"); } public static <T> R<T> ok(String msg) { return restResult(null, SUCCESS, msg); } - public static <T> R<T> ok(T data, String msg) { + public static <T> R<T> ok(String msg, T data) { return restResult(data, SUCCESS, msg); } public static <T> R<T> fail() { - return restResult(null, FAIL, null); + return restResult(null, FAIL, "鎿嶄綔澶辫触"); } public static <T> R<T> fail(String msg) { @@ -62,10 +62,10 @@ } public static <T> R<T> fail(T data) { - return restResult(data, FAIL, null); + return restResult(data, FAIL, "鎿嶄綔澶辫触"); } - public static <T> R<T> fail(T data, String msg) { + public static <T> R<T> fail(String msg, T data) { return restResult(data, FAIL, msg); } -- Gitblit v1.9.3