From b394df082b875856884d6d02cce2a43c49ad6704 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 30 May 2025 16:44:46 +0800
Subject: [PATCH] Merge branch 'feature/pc-base' into xin

---
 oying-system/src/main/java/com/oying/modules/pc/common/core/domain/R.java |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/pc/common/core/domain/R.java b/oying-system/src/main/java/com/oying/modules/pc/common/core/domain/R.java
index 62a992b..e85df96 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/common/core/domain/R.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/common/core/domain/R.java
@@ -22,9 +22,9 @@
      */
     public static final int FAIL = 1;
 
-    private int code;
+    private int status;
 
-    private String msg;
+    private String message;
 
     private T data;
 
@@ -62,26 +62,26 @@
 
     private static <T> R<T> restResult(T data, int code, String msg) {
         R<T> apiResult = new R<>();
-        apiResult.setCode(code);
+        apiResult.setStatus(code);
         apiResult.setData(data);
-        apiResult.setMsg(msg);
+        apiResult.setMessage(msg);
         return apiResult;
     }
 
-    public int getCode() {
-        return code;
+    public int getStatus() {
+        return status;
     }
 
-    public void setCode(int code) {
-        this.code = code;
+    public void setStatus(int status) {
+        this.status = status;
     }
 
-    public String getMsg() {
-        return msg;
+    public String getMessage() {
+        return message;
     }
 
-    public void setMsg(String msg) {
-        this.msg = msg;
+    public void setMessage(String message) {
+        this.message = message;
     }
 
     public T getData() {
@@ -97,6 +97,6 @@
     }
 
     public static <T> Boolean isSuccess(R<T> ret) {
-        return R.SUCCESS == ret.getCode();
+        return R.SUCCESS == ret.getStatus();
     }
 }

--
Gitblit v1.9.3