From 2a403069421812d49ce1b78dc5c4adc595ee0e7d Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 30 May 2025 18:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
oying-common/src/main/java/com/oying/utils/R.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/common/core/domain/R.java b/oying-common/src/main/java/com/oying/utils/R.java
similarity index 94%
rename from oying-system/src/main/java/com/oying/modules/pc/common/core/domain/R.java
rename to oying-common/src/main/java/com/oying/utils/R.java
index e85df96..70040f4 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/common/core/domain/R.java
+++ b/oying-common/src/main/java/com/oying/utils/R.java
@@ -1,4 +1,4 @@
-package com.oying.modules.pc.common.core.domain;
+package com.oying.utils;
import java.io.Serializable;
@@ -29,7 +29,7 @@
private T data;
public static <T> R<T> success() {
- return restResult(null, SUCCESS, null);
+ return restResult(null, SUCCESS, "null");
}
public static <T> R<T> success(T data) {
--
Gitblit v1.9.3