From 9289aa181144778637d18a3f727663a10b5195cc Mon Sep 17 00:00:00 2001
From: zhangf <1603559716@qq.com>
Date: 星期一, 24 六月 2024 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/master' into zf1
---
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
index a685e06..8eb0f87 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -113,6 +113,13 @@
{
return AjaxResult.success(message);
}
+ /**
+ * 返回成功消息
+ */
+ public AjaxResult ok(Object data)
+ {
+ return AjaxResult.success(data);
+ }
/**
* 返回成功消息
--
Gitblit v1.9.2