From a16ae7dadc204beafefde99af82918d3fbe9a5d6 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 17 三月 2022 12:32:51 +0800
Subject: [PATCH] !156 修复角色、岗位、字典数据在PostgreSQL执行插入或者更新SQL报错问题，修改对应实体类的排序属性为Integer类型。 Merge pull request !156 from KonBAI/sort_type
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 8fa4a64..7a24202 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
@@ -38,23 +38,23 @@
private T data;
public static <T> R<T> ok() {
- return restResult(null, SUCCESS, null);
+ return restResult(null, SUCCESS, "鎿嶄綔鎴愬姛");
}
public static <T> R<T> ok(T data) {
- return restResult(data, SUCCESS, null);
+ return restResult(data, SUCCESS, "鎿嶄綔鎴愬姛");
}
public static <T> R<T> ok(String msg) {
return restResult(null, SUCCESS, msg);
}
- public static <T> R<T> ok(T data, String msg) {
+ public static <T> R<T> ok(String msg, T data) {
return restResult(data, SUCCESS, msg);
}
public static <T> R<T> fail() {
- return restResult(null, FAIL, null);
+ return restResult(null, FAIL, "鎿嶄綔澶辫触");
}
public static <T> R<T> fail(String msg) {
@@ -62,10 +62,10 @@
}
public static <T> R<T> fail(T data) {
- return restResult(data, FAIL, null);
+ return restResult(data, FAIL, "鎿嶄綔澶辫触");
}
- public static <T> R<T> fail(T data, String msg) {
+ public static <T> R<T> fail(String msg, T data) {
return restResult(data, FAIL, msg);
}
--
Gitblit v1.9.3