From aa7cd23e83b8014f5cdaf9a7c4bc44a724e2c99d Mon Sep 17 00:00:00 2001 From: song-tianyang Date: Wed, 24 May 2023 16:42:13 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92domain?= =?UTF-8?q?=E8=81=94=E5=90=88=E7=BB=84=E4=BB=B6=E7=9A=84Id=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 去除测试计划domain联合组件的Id注解 --- .../main/java/io/metersphere/plan/domain/TestPlanFollow.java | 3 --- .../java/io/metersphere/plan/domain/TestPlanPrincipal.java | 3 --- 2 files changed, 6 deletions(-) diff --git a/backend/framework/domain/src/main/java/io/metersphere/plan/domain/TestPlanFollow.java b/backend/framework/domain/src/main/java/io/metersphere/plan/domain/TestPlanFollow.java index 75264ffee7..5c2e5d26d4 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/plan/domain/TestPlanFollow.java +++ b/backend/framework/domain/src/main/java/io/metersphere/plan/domain/TestPlanFollow.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import jakarta.validation.constraints.NotBlank; import lombok.Data; -import org.springframework.data.annotation.Id; import org.springframework.data.relational.core.mapping.Table; import java.io.Serializable; @@ -15,12 +14,10 @@ import java.io.Serializable; @Data public class TestPlanFollow implements Serializable { private static final long serialVersionUID = 1L; - @Id @NotBlank(message = "{test_plan_follow.test_plan_id.not_blank}", groups = {Updated.class}) @ApiModelProperty(name = "测试计划ID", required = true, allowableValues = "range[1, 50]") private String testPlanId; - @Id @NotBlank(message = "{test_plan_follow.user_id.not_blank}", groups = {Updated.class}) @ApiModelProperty(name = "用户ID", required = true, allowableValues = "range[1, 50]") private String userId; diff --git a/backend/framework/domain/src/main/java/io/metersphere/plan/domain/TestPlanPrincipal.java b/backend/framework/domain/src/main/java/io/metersphere/plan/domain/TestPlanPrincipal.java index 8a5e88ca28..24c33ee1b7 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/plan/domain/TestPlanPrincipal.java +++ b/backend/framework/domain/src/main/java/io/metersphere/plan/domain/TestPlanPrincipal.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import jakarta.validation.constraints.NotBlank; import lombok.Data; -import org.springframework.data.annotation.Id; import org.springframework.data.relational.core.mapping.Table; import java.io.Serializable; @@ -15,12 +14,10 @@ import java.io.Serializable; @Data public class TestPlanPrincipal implements Serializable { private static final long serialVersionUID = 1L; - @Id @NotBlank(message = "{test_plan_principal.test_plan_id.not_blank}", groups = {Updated.class}) @ApiModelProperty(name = "测试计划ID", required = true, allowableValues = "range[1, 50]") private String testPlanId; - @Id @NotBlank(message = "{test_plan_principal.user_id.not_blank}", groups = {Updated.class}) @ApiModelProperty(name = "用户ID", required = true, allowableValues = "range[1, 50]") private String userId;