From 3941094ef270f66d3da38600fdc4b9aae6faa35a Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Sun, 23 Jan 2022 20:58:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=B8=8D=E7=94=A8=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/domain/ApiDefinition.java            |  2 -
 .../base/domain/ApiDefinitionExample.java     | 70 -------------------
 .../base/mapper/ApiDefinitionMapper.xml       | 31 ++------
 3 files changed, 7 insertions(+), 96 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiDefinition.java b/backend/src/main/java/io/metersphere/base/domain/ApiDefinition.java
index 7ebdf3d9e9..6edb0c98ad 100644
--- a/backend/src/main/java/io/metersphere/base/domain/ApiDefinition.java
+++ b/backend/src/main/java/io/metersphere/base/domain/ApiDefinition.java
@@ -54,8 +54,6 @@ public class ApiDefinition implements Serializable {
 
     private Long order;
 
-    private String version;
-
     private String refId;
 
     private String versionId;
diff --git a/backend/src/main/java/io/metersphere/base/domain/ApiDefinitionExample.java b/backend/src/main/java/io/metersphere/base/domain/ApiDefinitionExample.java
index e5eee4e7d6..d46f3ac8c5 100644
--- a/backend/src/main/java/io/metersphere/base/domain/ApiDefinitionExample.java
+++ b/backend/src/main/java/io/metersphere/base/domain/ApiDefinitionExample.java
@@ -1734,76 +1734,6 @@ public class ApiDefinitionExample {
             return (Criteria) this;
         }
 
-        public Criteria andVersionIsNull() {
-            addCriterion("version is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionIsNotNull() {
-            addCriterion("version is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionEqualTo(String value) {
-            addCriterion("version =", value, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNotEqualTo(String value) {
-            addCriterion("version <>", value, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionGreaterThan(String value) {
-            addCriterion("version >", value, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionGreaterThanOrEqualTo(String value) {
-            addCriterion("version >=", value, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionLessThan(String value) {
-            addCriterion("version <", value, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionLessThanOrEqualTo(String value) {
-            addCriterion("version <=", value, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionLike(String value) {
-            addCriterion("version like", value, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNotLike(String value) {
-            addCriterion("version not like", value, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionIn(List<String> values) {
-            addCriterion("version in", values, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNotIn(List<String> values) {
-            addCriterion("version not in", values, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionBetween(String value1, String value2) {
-            addCriterion("version between", value1, value2, "version");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNotBetween(String value1, String value2) {
-            addCriterion("version not between", value1, value2, "version");
-            return (Criteria) this;
-        }
-
         public Criteria andRefIdIsNull() {
             addCriterion("ref_id is null");
             return (Criteria) this;
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ApiDefinitionMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ApiDefinitionMapper.xml
index 4f1bba05e5..abd2e8796f 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ApiDefinitionMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ApiDefinitionMapper.xml
@@ -26,7 +26,6 @@
     <result column="delete_time" jdbcType="BIGINT" property="deleteTime" />
     <result column="delete_user_id" jdbcType="VARCHAR" property="deleteUserId" />
     <result column="order" jdbcType="BIGINT" property="order" />
-    <result column="version" jdbcType="VARCHAR" property="version" />
     <result column="ref_id" jdbcType="VARCHAR" property="refId" />
     <result column="version_id" jdbcType="VARCHAR" property="versionId" />
     <result column="latest" jdbcType="BIT" property="latest" />
@@ -99,7 +98,7 @@
     id, project_id, `name`, `method`, module_path, environment_id, schedule, `status`, 
     module_id, user_id, create_time, update_time, protocol, `path`, num, tags, original_state, 
     create_user, case_total, case_status, case_passing_rate, delete_time, delete_user_id, 
-    `order`, version, ref_id, version_id, latest
+    `order`, ref_id, version_id, latest
   </sql>
   <sql id="Blob_Column_List">
     description, request, response, remark
@@ -161,9 +160,9 @@
       tags, original_state, create_user, 
       case_total, case_status, case_passing_rate, 
       delete_time, delete_user_id, `order`, 
-      version, ref_id, version_id, 
-      latest, description, request, 
-      response, remark)
+      ref_id, version_id, latest, 
+      description, request, response, 
+      remark)
     VALUES (#{id,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
       #{method,jdbcType=VARCHAR}, #{modulePath,jdbcType=VARCHAR}, #{environmentId,jdbcType=VARCHAR}, 
       #{schedule,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{moduleId,jdbcType=VARCHAR}, 
@@ -172,9 +171,9 @@
       #{tags,jdbcType=VARCHAR}, #{originalState,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
       #{caseTotal,jdbcType=VARCHAR}, #{caseStatus,jdbcType=VARCHAR}, #{casePassingRate,jdbcType=VARCHAR}, 
       #{deleteTime,jdbcType=BIGINT}, #{deleteUserId,jdbcType=VARCHAR}, #{order,jdbcType=BIGINT}, 
-      #{version,jdbcType=VARCHAR}, #{refId,jdbcType=VARCHAR}, #{versionId,jdbcType=VARCHAR}, 
-      #{latest,jdbcType=BIT}, #{description,jdbcType=LONGVARCHAR}, #{request,jdbcType=LONGVARCHAR}, 
-      #{response,jdbcType=LONGVARCHAR}, #{remark,jdbcType=LONGVARCHAR})
+      #{refId,jdbcType=VARCHAR}, #{versionId,jdbcType=VARCHAR}, #{latest,jdbcType=BIT}, 
+      #{description,jdbcType=LONGVARCHAR}, #{request,jdbcType=LONGVARCHAR}, #{response,jdbcType=LONGVARCHAR}, 
+      #{remark,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.ApiDefinitionWithBLOBs">
     insert into api_definition
@@ -251,9 +250,6 @@
       <if test="order != null">
         `order`,
       </if>
-      <if test="version != null">
-        version,
-      </if>
       <if test="refId != null">
         ref_id,
       </if>
@@ -349,9 +345,6 @@
       <if test="order != null">
         #{order,jdbcType=BIGINT},
       </if>
-      <if test="version != null">
-        #{version,jdbcType=VARCHAR},
-      </if>
       <if test="refId != null">
         #{refId,jdbcType=VARCHAR},
       </if>
@@ -456,9 +449,6 @@
       <if test="record.order != null">
         `order` = #{record.order,jdbcType=BIGINT},
       </if>
-      <if test="record.version != null">
-        version = #{record.version,jdbcType=VARCHAR},
-      </if>
       <if test="record.refId != null">
         ref_id = #{record.refId,jdbcType=VARCHAR},
       </if>
@@ -511,7 +501,6 @@
       delete_time = #{record.deleteTime,jdbcType=BIGINT},
       delete_user_id = #{record.deleteUserId,jdbcType=VARCHAR},
       `order` = #{record.order,jdbcType=BIGINT},
-      version = #{record.version,jdbcType=VARCHAR},
       ref_id = #{record.refId,jdbcType=VARCHAR},
       version_id = #{record.versionId,jdbcType=VARCHAR},
       latest = #{record.latest,jdbcType=BIT},
@@ -549,7 +538,6 @@
       delete_time = #{record.deleteTime,jdbcType=BIGINT},
       delete_user_id = #{record.deleteUserId,jdbcType=VARCHAR},
       `order` = #{record.order,jdbcType=BIGINT},
-      version = #{record.version,jdbcType=VARCHAR},
       ref_id = #{record.refId,jdbcType=VARCHAR},
       version_id = #{record.versionId,jdbcType=VARCHAR},
       latest = #{record.latest,jdbcType=BIT}
@@ -629,9 +617,6 @@
       <if test="order != null">
         `order` = #{order,jdbcType=BIGINT},
       </if>
-      <if test="version != null">
-        version = #{version,jdbcType=VARCHAR},
-      </if>
       <if test="refId != null">
         ref_id = #{refId,jdbcType=VARCHAR},
       </if>
@@ -681,7 +666,6 @@
       delete_time = #{deleteTime,jdbcType=BIGINT},
       delete_user_id = #{deleteUserId,jdbcType=VARCHAR},
       `order` = #{order,jdbcType=BIGINT},
-      version = #{version,jdbcType=VARCHAR},
       ref_id = #{refId,jdbcType=VARCHAR},
       version_id = #{versionId,jdbcType=VARCHAR},
       latest = #{latest,jdbcType=BIT},
@@ -716,7 +700,6 @@
       delete_time = #{deleteTime,jdbcType=BIGINT},
       delete_user_id = #{deleteUserId,jdbcType=VARCHAR},
       `order` = #{order,jdbcType=BIGINT},
-      version = #{version,jdbcType=VARCHAR},
       ref_id = #{refId,jdbcType=VARCHAR},
       version_id = #{versionId,jdbcType=VARCHAR},
       latest = #{latest,jdbcType=BIT}