From 1b609c606eb9e1a5ba208134bb9b2c140bf65264 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=8A=93=E8=9B=99=E5=B8=88?= <770492966@qq.com>
Date: Sat, 12 Feb 2022 10:48:16 +0800
Subject: [PATCH] =?UTF-8?q?R=E7=B1=BB=E6=96=B9=E6=B3=95=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=BA=E5=BA=8F=E4=B8=BAcode,msg,data?=
 =?UTF-8?q?=EF=BC=8C=E9=98=85=E8=AF=BB=E6=96=B9=E4=BE=BF=EF=BC=8C=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E4=B8=BAOK=E5=92=8CFAIL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/common/core/domain/R.java  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 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 f868e8e75..7cbb1e558 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
@@ -21,7 +21,7 @@ public class R<T> implements Serializable {
     /**
      * 成功
      */
-    public static final int SUCCESS = 200;
+    public static final int OK = 200;
 
     /**
      * 失败
@@ -38,46 +38,46 @@ public class R<T> implements Serializable {
     private T data;
 
     public static <T> R<T> ok() {
-        return restResult(null, SUCCESS, null);
+        return restResult(OK, null,null);
     }
 
     public static <T> R<T> ok(T data) {
-        return restResult(data, SUCCESS, null);
+        return restResult(OK, null,data);
     }
 
     public static <T> R<T> ok(String msg) {
-        return restResult(null, SUCCESS, msg);
+        return restResult( OK, msg,null);
     }
 
     public static <T> R<T> ok(String msg, T data) {
-        return restResult(data, SUCCESS, msg);
+        return restResult(OK, msg,data);
     }
 
     public static <T> R<T> fail() {
-        return restResult(null, FAIL, null);
+        return restResult( FAIL, null,null);
     }
 
     public static <T> R<T> fail(String msg) {
-        return restResult(null, FAIL, msg);
+        return restResult( FAIL, msg,null);
     }
 
     public static <T> R<T> fail(T data) {
-        return restResult(data, FAIL, null);
+        return restResult(FAIL, null,data);
     }
 
     public static <T> R<T> fail(String msg, T data) {
-        return restResult(data, FAIL, msg);
+        return restResult(FAIL, msg,data);
     }
 
     public static <T> R<T> fail(int code, String msg) {
-        return restResult(null, code, msg);
+        return restResult( code, msg,null);
     }
 
-    private static <T> R<T> restResult(T data, int code, String msg) {
+    private static <T> R<T> restResult(int code, String msg, T data) {
         R<T> r = new R<>();
         r.setCode(code);
-        r.setData(data);
         r.setMsg(msg);
+        r.setData(data);
         return r;
     }