From 68131557fbe02e669b287d68b9c47e611eba3382 Mon Sep 17 00:00:00 2001
From: liaoxuwei <5789413@qq.com>
Date: Mon, 12 Jun 2023 16:54:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E5=BA=9C=E9=80=9A=E5=8A=9E=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E6=B1=87=E8=81=9A=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../xhx/module/converge/web/ConvergeSiteController.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sst-manager/src/main/java/com/mortals/xhx/module/converge/web/ConvergeSiteController.java b/sst-manager/src/main/java/com/mortals/xhx/module/converge/web/ConvergeSiteController.java
index d804989..b7a37f3 100644
--- a/sst-manager/src/main/java/com/mortals/xhx/module/converge/web/ConvergeSiteController.java
+++ b/sst-manager/src/main/java/com/mortals/xhx/module/converge/web/ConvergeSiteController.java
@@ -55,7 +55,7 @@ public class ConvergeSiteController extends BaseCRUDJsonBodyMappingController<Co
method = {RequestMethod.POST, RequestMethod.GET}
)
@UnAuth
- public Rest<Object> getConvergeData() {
+ public String getConvergeData() {
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
Context context = this.getContext();
@@ -77,6 +77,6 @@ public class ConvergeSiteController extends BaseCRUDJsonBodyMappingController<Co
ret.setData(model);
ret.setDict(model.get("dict"));
ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
- return ret;
+ return JSONObject.toJSONString(model.get("data"));
}
}
\ No newline at end of file
--
2.24.3