From 56c366aa1cb1180f143f3d72d83d5b2658e11fb0 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Fri, 28 Jul 2023 14:09:36 +0800 Subject: [PATCH] chore: fix typo --- .../sdk/src/main/java/io/metersphere/sdk/dto/LogDTO.java | 2 ++ .../main/java/io/metersphere/sdk/dto/TestResourcePoolDTO.java | 2 ++ .../java/io/metersphere/sdk/dto/TestResourcePoolReturnDTO.java | 2 ++ .../src/main/java/io/metersphere/system/dto/PluginDTO.java | 2 ++ .../system/request/OrgMemberExtendProjectRequest.java | 2 ++ .../io/metersphere/system/request/ProjectMemberRequest.java | 2 ++ 6 files changed, 12 insertions(+) diff --git a/backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/LogDTO.java b/backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/LogDTO.java index 5f0ce74d47..cc435d4e6d 100644 --- a/backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/LogDTO.java +++ b/backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/LogDTO.java @@ -3,10 +3,12 @@ package io.metersphere.sdk.dto; import io.metersphere.sdk.domain.OperationLog; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.UUID; @Data +@EqualsAndHashCode(callSuper = false) public class LogDTO extends OperationLog { @Schema(title = "变更前内容") private byte[] originalValue; diff --git a/backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/TestResourcePoolDTO.java b/backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/TestResourcePoolDTO.java index 0da7ace07c..f8ad1eff87 100644 --- a/backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/TestResourcePoolDTO.java +++ b/backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/TestResourcePoolDTO.java @@ -3,8 +3,10 @@ package io.metersphere.sdk.dto; import io.metersphere.system.domain.TestResourcePool; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import lombok.EqualsAndHashCode; @Data +@EqualsAndHashCode(callSuper = false) public class TestResourcePoolDTO extends TestResourcePool { private TestResourceDTO testResourceDTO; diff --git a/backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/TestResourcePoolReturnDTO.java b/backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/TestResourcePoolReturnDTO.java index fef9e4f645..4a9e03bbde 100644 --- a/backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/TestResourcePoolReturnDTO.java +++ b/backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/TestResourcePoolReturnDTO.java @@ -3,8 +3,10 @@ package io.metersphere.sdk.dto; import io.metersphere.system.domain.TestResourcePool; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import lombok.EqualsAndHashCode; @Data +@EqualsAndHashCode(callSuper = false) public class TestResourcePoolReturnDTO extends TestResourcePool { private TestResourceReturnDTO testResourceReturnDTO; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/PluginDTO.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/PluginDTO.java index ccad65b30b..2d09828c05 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/PluginDTO.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/PluginDTO.java @@ -4,11 +4,13 @@ import io.metersphere.sdk.dto.OrganizationOptionDTO; import io.metersphere.system.domain.Plugin; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; import java.util.List; @Data +@EqualsAndHashCode(callSuper = false) public class PluginDTO extends Plugin implements Serializable { private static final long serialVersionUID = 1L; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrgMemberExtendProjectRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrgMemberExtendProjectRequest.java index 7742777d1c..decd39d36d 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrgMemberExtendProjectRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrgMemberExtendProjectRequest.java @@ -3,6 +3,7 @@ package io.metersphere.system.request; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.List; @@ -10,6 +11,7 @@ import java.util.List; * @author guoyuqi */ @Data +@EqualsAndHashCode(callSuper = false) public class OrgMemberExtendProjectRequest extends OrganizationMemberRequest{ /** diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/ProjectMemberRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/request/ProjectMemberRequest.java index aa1cbc7b01..a5f39152d4 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/ProjectMemberRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/request/ProjectMemberRequest.java @@ -4,8 +4,10 @@ import io.metersphere.sdk.dto.BasePageRequest; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.Data; +import lombok.EqualsAndHashCode; @Data +@EqualsAndHashCode(callSuper = false) public class ProjectMemberRequest extends BasePageRequest { @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{project.id.not_blank}")