分支合并冲突解决

chenrui

2025-03-13 f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e

 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);