From 0306d5836a7a56614e01af35b9e70f0224b47cb2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 14 十二月 2023 13:51:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
index 42fbd9c..7f25464 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
@@ -2,6 +2,7 @@
import java.util.HashMap;
import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.common.utils.StringUtils;
/**
@@ -65,7 +66,8 @@
*/
public static AjaxResult success()
{
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ String message = MessageUtils.message("operation.success");
+ return AjaxResult.success(message);
}
/**
@@ -74,8 +76,8 @@
* @return 鎴愬姛娑堟伅
*/
public static AjaxResult success(Object data)
- {
- return AjaxResult.success("鎿嶄綔鎴愬姛", data);
+ { String message = MessageUtils.message("operation.success");
+ return AjaxResult.success(message, data);
}
/**
@@ -131,7 +133,8 @@
*/
public static AjaxResult error()
{
- return AjaxResult.error("鎿嶄綔澶辫触");
+ String message = MessageUtils.message("operation.failed");
+ return AjaxResult.error(message);
}
/**
--
Gitblit v1.9.3