From 29d7e6d829dd01555463f6869ba74d94c73cb3d0 Mon Sep 17 00:00:00 2001 From: songyuanlun Date: Tue, 7 Jan 2025 15:17:08 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3488):=20=E7=8F=AD=E7=BB=84=E7=B1=BB?= =?UTF-8?q?=E5=88=AB=E5=88=86=E7=BB=84resp=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/project/team/feign/OrgProjectTeamCategoryApi.java | 4 ++-- .../{TeamCategoryResp.java => TeamCategoryGroupResp.java} | 2 +- .../team/controller/OrgProjectTeamCategoryController.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/team/resp/{TeamCategoryResp.java => TeamCategoryGroupResp.java} (93%) diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/project/team/feign/OrgProjectTeamCategoryApi.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/project/team/feign/OrgProjectTeamCategoryApi.java index 5ba2a7e..ead9c7f 100644 --- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/project/team/feign/OrgProjectTeamCategoryApi.java +++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/project/team/feign/OrgProjectTeamCategoryApi.java @@ -13,7 +13,7 @@ import cn.axzo.orgmanax.dto.project.team.req.SaveProjectTeamCategoryReq; import cn.axzo.orgmanax.dto.project.team.req.SingletonOrgTeamCategoryReq; import cn.axzo.orgmanax.dto.project.team.resp.RemoveTeamCategoryCheckResp; import cn.axzo.orgmanax.dto.project.team.resp.SingletonOrgTeamCategoryResp; -import cn.axzo.orgmanax.dto.project.team.resp.TeamCategoryResp; +import cn.axzo.orgmanax.dto.project.team.resp.TeamCategoryGroupResp; import java.util.List; import javax.validation.Valid; import javax.validation.constraints.NotEmpty; @@ -39,7 +39,7 @@ public interface OrgProjectTeamCategoryApi { * 用到 org_project_team_category 表数据 */ @PostMapping("/api/project/team-category/group-list") - ApiResult> groupList(@RequestBody GroupTeamCategoryReq req); + ApiResult> groupList(@RequestBody GroupTeamCategoryReq req); /** * todo 三期实现 diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/team/resp/TeamCategoryResp.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/team/resp/TeamCategoryGroupResp.java similarity index 93% rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/team/resp/TeamCategoryResp.java rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/team/resp/TeamCategoryGroupResp.java index 28246ee..97ebca5 100644 --- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/team/resp/TeamCategoryResp.java +++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/project/team/resp/TeamCategoryGroupResp.java @@ -15,7 +15,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -public class TeamCategoryResp { +public class TeamCategoryGroupResp { /** * 班组id diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/project/team/controller/OrgProjectTeamCategoryController.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/project/team/controller/OrgProjectTeamCategoryController.java index cc23e11..a67c0e9 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/project/team/controller/OrgProjectTeamCategoryController.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/project/team/controller/OrgProjectTeamCategoryController.java @@ -14,7 +14,7 @@ import cn.axzo.orgmanax.dto.project.team.req.SaveProjectTeamCategoryReq; import cn.axzo.orgmanax.dto.project.team.req.SingletonOrgTeamCategoryReq; import cn.axzo.orgmanax.dto.project.team.resp.RemoveTeamCategoryCheckResp; import cn.axzo.orgmanax.dto.project.team.resp.SingletonOrgTeamCategoryResp; -import cn.axzo.orgmanax.dto.project.team.resp.TeamCategoryResp; +import cn.axzo.orgmanax.dto.project.team.resp.TeamCategoryGroupResp; import cn.axzo.orgmanax.server.project.team.service.ProjectTeamCategoryService; import cn.axzo.orgmanax.server.project.team.service.dto.ListTeamCategoryReq; import cn.hutool.core.bean.BeanUtil; @@ -35,7 +35,7 @@ public class OrgProjectTeamCategoryController implements OrgProjectTeamCategoryA private final ProjectTeamCategoryService projectTeamCategoryService; @Override - public ApiResult> groupList(GroupTeamCategoryReq req) { + public ApiResult> groupList(GroupTeamCategoryReq req) { return null; }