diff --git a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionBlob.java b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionBlob.java index b315532168..ac4d1ff4c0 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionBlob.java +++ b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionBlob.java @@ -22,8 +22,7 @@ public class ApiDefinitionBlob extends ApiDefinition implements Serializable { @TableId @NotBlank(message = "{api_definition_blob.api_definition_id.not_blank}", groups = {Updated.class}) @ApiModelProperty(name = "接口fk/ 一对一关系", required = true, allowableValues = "range[1, 50]") - private String apiDefinitionId; - + private String id; @ApiModelProperty(name = "请求内容", required = false, dataType = "byte[]") private byte[] request; diff --git a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionMockConfig.java b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionMockConfig.java index 7aee2aa791..02e5a5cb4c 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionMockConfig.java +++ b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionMockConfig.java @@ -14,13 +14,13 @@ import java.io.Serializable; @ApiModel(value = "mock期望值配置") @TableName("api_definition_mock_config") @Data -public class ApiDefinitionMockConfig implements Serializable { +public class ApiDefinitionMockConfig extends ApiDefinitionMock implements Serializable { private static final long serialVersionUID = 1L; @TableId @NotBlank(message = "{api_definition_mock_config.api_definition_mock_id.not_blank}", groups = {Updated.class}) @ApiModelProperty(name = "接口mock pk", required = true, allowableValues = "range[1, 50]") - private String apiDefinitionMockId; + private String id; @ApiModelProperty(name = "请求内容", required = false, allowableValues = "range[1, ]") private byte[] request; diff --git a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReportBlob.java b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReportBlob.java index a96ed4c4d5..74f9406a25 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReportBlob.java +++ b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReportBlob.java @@ -22,7 +22,7 @@ public class ApiReportBlob extends ApiReport implements Serializable { @TableId @NotBlank(message = "{api_report_blob.api_report_id.not_blank}", groups = {Updated.class}) @ApiModelProperty(name = "接口报告fk", required = true, allowableValues = "range[1, 50]") - private String apiReportId; + private String id; @ApiModelProperty(name = "结果内容详情", required = false, dataType = "byte[]") private byte[] content; diff --git a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioBlob.java b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioBlob.java index a02e586f9a..5cb97fefa4 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioBlob.java +++ b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioBlob.java @@ -22,7 +22,7 @@ public class ApiScenarioBlob extends ApiScenario implements Serializable { @TableId @NotBlank(message = "{api_scenario_blob.api_scenario_id.not_blank}", groups = {Updated.class}) @ApiModelProperty(name = "场景pk", required = true, allowableValues = "range[1, 50]") - private String apiScenarioId; + private String id; @ApiModelProperty(name = "场景步骤内容", required = false, dataType = "byte[]") private byte[] content; diff --git a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiTestCaseBlob.java b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiTestCaseBlob.java index 89378defdb..2dc07f605b 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiTestCaseBlob.java +++ b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiTestCaseBlob.java @@ -22,7 +22,7 @@ public class ApiTestCaseBlob extends ApiTestCase implements Serializable { @TableId @NotBlank(message = "{api_test_case_blob.api_test_case_id.not_blank}", groups = {Updated.class}) @ApiModelProperty(name = "接口用例pk", required = true, allowableValues = "range[1, 50]") - private String apiTestCaseId; + private String id; @ApiModelProperty(name = "请求内容", required = false, dataType = "byte[]") private byte[] request;