From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/Result.java | 4 ++++
1 files changed, 4 insertions(+), 0 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..7b6861d 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
@@ -54,6 +54,10 @@
return restResult(data, FAIL, "鎿嶄綔澶辫触");
}
+ public static <T> Result<T> fail(Integer code){
+ return restResult(null, code,"fail");
+ }
+
public static <T> Result<T> fail(T data, String msg)
{
return restResult(data, FAIL, msg);
--
Gitblit v1.9.3