diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCase.java b/backend/src/main/java/io/metersphere/base/domain/TestCase.java index fcd9e1eaa0..39986fd37c 100644 --- a/backend/src/main/java/io/metersphere/base/domain/TestCase.java +++ b/backend/src/main/java/io/metersphere/base/domain/TestCase.java @@ -23,8 +23,6 @@ public class TestCase implements Serializable { private String method; - private String prerequisite; - private Long createTime; private Long updateTime; @@ -52,6 +50,6 @@ public class TestCase implements Serializable { private String customNum; private String stepModel; - + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java b/backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java index bd705ebc3a..7e5cb7ca2e 100644 --- a/backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java +++ b/backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java @@ -734,76 +734,6 @@ public class TestCaseExample { return (Criteria) this; } - public Criteria andPrerequisiteIsNull() { - addCriterion("prerequisite is null"); - return (Criteria) this; - } - - public Criteria andPrerequisiteIsNotNull() { - addCriterion("prerequisite is not null"); - return (Criteria) this; - } - - public Criteria andPrerequisiteEqualTo(String value) { - addCriterion("prerequisite =", value, "prerequisite"); - return (Criteria) this; - } - - public Criteria andPrerequisiteNotEqualTo(String value) { - addCriterion("prerequisite <>", value, "prerequisite"); - return (Criteria) this; - } - - public Criteria andPrerequisiteGreaterThan(String value) { - addCriterion("prerequisite >", value, "prerequisite"); - return (Criteria) this; - } - - public Criteria andPrerequisiteGreaterThanOrEqualTo(String value) { - addCriterion("prerequisite >=", value, "prerequisite"); - return (Criteria) this; - } - - public Criteria andPrerequisiteLessThan(String value) { - addCriterion("prerequisite <", value, "prerequisite"); - return (Criteria) this; - } - - public Criteria andPrerequisiteLessThanOrEqualTo(String value) { - addCriterion("prerequisite <=", value, "prerequisite"); - return (Criteria) this; - } - - public Criteria andPrerequisiteLike(String value) { - addCriterion("prerequisite like", value, "prerequisite"); - return (Criteria) this; - } - - public Criteria andPrerequisiteNotLike(String value) { - addCriterion("prerequisite not like", value, "prerequisite"); - return (Criteria) this; - } - - public Criteria andPrerequisiteIn(List values) { - addCriterion("prerequisite in", values, "prerequisite"); - return (Criteria) this; - } - - public Criteria andPrerequisiteNotIn(List values) { - addCriterion("prerequisite not in", values, "prerequisite"); - return (Criteria) this; - } - - public Criteria andPrerequisiteBetween(String value1, String value2) { - addCriterion("prerequisite between", value1, value2, "prerequisite"); - return (Criteria) this; - } - - public Criteria andPrerequisiteNotBetween(String value1, String value2) { - addCriterion("prerequisite not between", value1, value2, "prerequisite"); - return (Criteria) this; - } - public Criteria andCreateTimeIsNull() { addCriterion("create_time is null"); return (Criteria) this; @@ -1743,7 +1673,6 @@ public class TestCaseExample { addCriterion("step_model not between", value1, value2, "stepModel"); return (Criteria) this; } - } public static class Criteria extends GeneratedCriteria { diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCaseWithBLOBs.java b/backend/src/main/java/io/metersphere/base/domain/TestCaseWithBLOBs.java index 6658a35723..0b79daa67b 100644 --- a/backend/src/main/java/io/metersphere/base/domain/TestCaseWithBLOBs.java +++ b/backend/src/main/java/io/metersphere/base/domain/TestCaseWithBLOBs.java @@ -9,6 +9,8 @@ import lombok.ToString; @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class TestCaseWithBLOBs extends TestCase implements Serializable { + private String prerequisite; + private String remark; private String steps; diff --git a/backend/src/main/java/io/metersphere/base/mapper/TestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/TestCaseMapper.xml index ad2c420971..44a8e84811 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/TestCaseMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/TestCaseMapper.xml @@ -11,7 +11,6 @@ - @@ -28,6 +27,7 @@ + @@ -94,11 +94,11 @@ id, node_id, node_path, project_id, `name`, `type`, maintainer, priority, `method`, - prerequisite, create_time, update_time, test_id, sort, num, other_test_name, review_status, - tags, demand_id, demand_name, follow_people, `status`, custom_num, step_model + create_time, update_time, test_id, sort, num, other_test_name, review_status, tags, + demand_id, demand_name, follow_people, `status`, custom_num, step_model - remark, steps, step_description, expected_result, custom_fields + prerequisite, remark, steps, step_description, expected_result, custom_fields