From d9528f03fada8d1c9ce5435fb7fd1d5c5cfdc393 Mon Sep 17 00:00:00 2001
From: yangsong <yangsong@axzo.cn>
Date: Tue, 12 Sep 2023 14:10:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=B1=BB=E5=9E=8B=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/axzo/tyr/client/feign/SaasRoleGroupApi.java    | 5 +++--
 .../server/controller/role/SaasRoleGroupController.java    | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasRoleGroupApi.java b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasRoleGroupApi.java
index 7f2886f4..602b5aa7 100644
--- a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasRoleGroupApi.java
+++ b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/SaasRoleGroupApi.java
@@ -1,6 +1,5 @@
 package cn.axzo.tyr.client.feign;
 
-import cn.axzo.framework.domain.web.result.ApiListResult;
 import cn.axzo.framework.domain.web.result.ApiResult;
 import cn.axzo.tyr.client.model.req.QuerySaasRoleGroupReq;
 import cn.axzo.tyr.client.model.vo.SaasRoleGroupVO;
@@ -9,6 +8,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * 角色分组
  */
@@ -27,7 +28,7 @@ public interface SaasRoleGroupApi {
      * @return
      */
     @PostMapping("getList")
-    ApiListResult<SaasRoleGroupVO> getList(@RequestBody QuerySaasRoleGroupReq req);
+    ApiResult<List<SaasRoleGroupVO>> getList(@RequestBody QuerySaasRoleGroupReq req);
 
     /**
      * 删除分组
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleGroupController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleGroupController.java
index e25896c0..c78b9a9c 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleGroupController.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleGroupController.java
@@ -1,6 +1,5 @@
 package cn.axzo.tyr.server.controller.role;
 
-import cn.axzo.framework.domain.web.result.ApiListResult;
 import cn.axzo.framework.domain.web.result.ApiResult;
 import cn.axzo.tyr.client.feign.SaasRoleGroupApi;
 import cn.axzo.tyr.client.model.req.QuerySaasRoleGroupReq;
@@ -10,6 +9,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @Slf4j
 @RestController
 @RequiredArgsConstructor
@@ -22,8 +23,8 @@ public class SaasRoleGroupController implements SaasRoleGroupApi {
     }
 
     @Override
-    public ApiListResult<SaasRoleGroupVO> getList(QuerySaasRoleGroupReq req) {
-        return ApiListResult.ok(saasRoleGroupService.getList(req));
+    public ApiResult<List<SaasRoleGroupVO>> getList(QuerySaasRoleGroupReq req) {
+        return ApiResult.ok(saasRoleGroupService.getList(req));
     }
 
     @Override