diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTestCase.java b/xm-core/src/main/java/com/xm/core/entity/XmTestCase.java
index 4845d57b..c3fa6f65 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmTestCase.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmTestCase.java
@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmTestCase所有属性名: <br>
- *	"id","主键","caseName","标题","caseRemark","备注","testStep","测试步骤","expectResult","期望结果","menuId","关联的故事","menuName","关联故事名","ctime","创建时间","ltime","更新时间","luserid","更新人编号","lusername","更新人姓名","cbranchId","创建机构","moduleId","模块编号","moduleName","模块名称","caseStatus","用例状态0-草稿，1-评审中，2-审核通过，3-审核未通过，4-废弃","cuserid","创建人编号","cusername","创建人姓名","productId","产品编号","verNum","版本号","casedbId","用例库编号","casedbName","用例库名称","funcId","功能菜单编号","funcName","功能菜单名称","funcPnames","上级菜单名称列表逗号分割","preRemark","前置条件描述","caseType","用例类型","cpriority","优先级","budgetWorkload","预算工时","actWorkload","实际工时","initWorkload","原估工时","retest","是否可作为回归测试用例0-否，1-是","pbranchId","产品归属企业";<br>
+ *	"id","主键","caseName","标题","caseRemark","备注","testStep","测试步骤","expectResult","期望结果","menuId","关联的故事","menuName","关联故事名","ctime","创建时间","ltime","更新时间","luserid","更新人编号","lusername","更新人姓名","cbranchId","创建机构","moduleId","模块编号","moduleName","模块名称","caseStatus","用例状态0-草稿，1-评审中，2-审核通过，3-审核未通过，4-废弃","cuserid","创建人编号","cusername","创建人姓名","productId","产品编号","verNum","版本号","casedbId","用例库编号","casedbName","用例库名称","funcId","功能菜单编号","funcName","功能菜单名称","funcPnames","上级菜单名称列表逗号分割","preRemark","前置条件描述","caseType","用例类型-与bug类型相同","cpriority","优先级","budgetWorkload","预算工时","actWorkload","实际工时","initWorkload","原估工时","retest","是否可作为回归测试用例0-否，1-是","pbranchId","产品归属企业","testType","测试方式0-手工，1-自动";<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -95,7 +95,7 @@ public class XmTestCase  implements java.io.Serializable {
 	@ApiModelProperty(notes="前置条件描述",allowEmptyValue=true,example="",allowableValues="")
 	String preRemark;
 	
-	@ApiModelProperty(notes="用例类型",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="用例类型-与bug类型相同",allowEmptyValue=true,example="",allowableValues="")
 	String caseType;
 	
 	@ApiModelProperty(notes="优先级",allowEmptyValue=true,example="",allowableValues="")
@@ -115,6 +115,9 @@ public class XmTestCase  implements java.io.Serializable {
 	
 	@ApiModelProperty(notes="产品归属企业",allowEmptyValue=true,example="",allowableValues="")
 	String pbranchId;
+	
+	@ApiModelProperty(notes="测试方式0-手工，1-自动",allowEmptyValue=true,example="",allowableValues="")
+	String testType;
 
 	/**
 	 *主键
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTestPlan.java b/xm-core/src/main/java/com/xm/core/entity/XmTestPlan.java
index 2bcaf90a..5faed3a9 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmTestPlan.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmTestPlan.java
@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmTestPlan所有属性名: <br>
- *	"id","测试计划编号","name","计划名称","casedbId","用例库编号","casedbName","用例库名称","projectId","项目编号","projectName","项目名称","cuserid","创建人编号","cusername","创建人名称","ctime","创建时间","stime","开始时间","etime","结束时间","status","状态0-未开始，1-进行中，2已结束","tcode","测试结果0未通过，1已通过","totalCases","总用例数","okCases","通过用例数","errCases","失败用例数","igCases","忽略用例数","blCases","阻塞用例数","productId","产品编号","productName","产品名称","flowState","评审结果0-待评审，1-已评审通过，2-已拒绝","bugCnt","bug数目","closedBugs","已关闭bug总数","resolvedBugs","已解决bug总数","activeBugs","激活的bug总数","confirmedBugs","已解决bug总数","menus","需求数目","funcs","功能模块数","budgetWorkload","预算工时","actWorkload","实际工时","summaryRemark","报告总结","cbranchId","创建机构编号","toTestCases","未测用例数","pbranchId","产品归属企业";<br>
+ *	"id","测试计划编号","name","计划名称","casedbId","用例库编号","casedbName","用例库名称","projectId","项目编号","projectName","项目名称","cuserid","创建人编号","cusername","创建人名称","ctime","创建时间","stime","开始时间","etime","结束时间","status","状态0-未开始，1-进行中，2已结束","tcode","测试结果0未通过，1已通过","totalCases","总用例数","okCases","通过用例数","errCases","失败用例数","igCases","忽略用例数","blCases","阻塞用例数","productId","产品编号","productName","产品名称","flowState","评审结果0-待评审，1-已评审通过，2-已拒绝","bugCnt","bug数目","closedBugs","已关闭bug总数","resolvedBugs","已解决bug总数","activeBugs","激活的bug总数","confirmedBugs","已解决bug总数","menus","需求数目","funcs","功能模块数","budgetWorkload","预算工时","actWorkload","实际工时","summaryRemark","报告总结","cbranchId","创建机构编号","toTestCases","未测用例数","pbranchId","产品归属企业","ptype","计划类型0-普通测试，2-迭代测试，1-发布测试，";<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -121,6 +121,9 @@ public class XmTestPlan  implements java.io.Serializable {
 	
 	@ApiModelProperty(notes="产品归属企业",allowEmptyValue=true,example="",allowableValues="")
 	String pbranchId;
+	
+	@ApiModelProperty(notes="计划类型0-普通测试，2-迭代测试，1-发布测试，",allowEmptyValue=true,example="",allowableValues="")
+	String ptype;
 
 	/**
 	 *测试计划编号
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTestPlanCase.java b/xm-core/src/main/java/com/xm/core/entity/XmTestPlanCase.java
index b95ea0a9..18940346 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmTestPlanCase.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmTestPlanCase.java
@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmTestPlanCase所有属性名: <br>
- *	"bugs","bug数目","execUserid","执行人","caseId","测试用例编号","ltime","更新时间","ctime","创建时间","execStatus","0-未测，1-通过，2-受阻，3-忽略，4-失败","execUsername","执行人姓名","priority","优先级","remark","执行备注","testStep","测试步骤","planId","计划编号","projectId","项目编号","budgetWorkload","预算工时","actWorkload","实际工时","initWorkload","原估工时","execDate","执行日期，以执行状态变更日期为准yyyy-MM-dd型";<br>
+ *	"bugs","bug数目","execUserid","执行人","caseId","测试用例编号","ltime","更新时间","ctime","创建时间","execStatus","0-未测，1-通过，2-受阻，3-忽略，4-失败","execUsername","执行人姓名","priority","优先级","remark","执行备注","testStep","测试步骤","planId","计划编号","projectId","项目编号","budgetWorkload","预算工时","actWorkload","实际工时","initWorkload","原估工时","execDate","执行日期，以执行状态变更日期为准yyyy-MM-dd型","execType","执行类型0-手工，1-自动化","productId","归属产品";<br>
  * 当前主键(包括多主键):<br>
  *	case_id,plan_id;<br>
  */
@@ -67,6 +67,12 @@ public class XmTestPlanCase  implements java.io.Serializable {
 	
 	@ApiModelProperty(notes="执行日期，以执行状态变更日期为准yyyy-MM-dd型",allowEmptyValue=true,example="",allowableValues="")
 	String execDate;
+	
+	@ApiModelProperty(notes="执行类型0-手工，1-自动化",allowEmptyValue=true,example="",allowableValues="")
+	String execType;
+	
+	@ApiModelProperty(notes="归属产品",allowEmptyValue=true,example="",allowableValues="")
+	String productId;
 
 	/**
 	 *测试用例编号,计划编号
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml
index 9b14b9cd..c6cb4990 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml
@@ -89,7 +89,7 @@
 		insert into xm_test_case(
 			<include refid="columns"/>
 		) values (
-		#{id},#{caseName},#{caseRemark},#{testStep},#{expectResult},#{menuId},#{menuName},#{ctime},#{ltime},#{luserid},#{lusername},#{cbranchId},#{moduleId},#{moduleName},#{caseStatus},#{cuserid},#{cusername},#{productId},#{verNum},#{casedbId},#{casedbName},#{funcId},#{funcName},#{funcPnames},#{preRemark},#{caseType},#{cpriority},#{budgetWorkload},#{actWorkload},#{initWorkload},#{retest},#{pbranchId}
+		#{id},#{caseName},#{caseRemark},#{testStep},#{expectResult},#{menuId},#{menuName},#{ctime},#{ltime},#{luserid},#{lusername},#{cbranchId},#{moduleId},#{moduleName},#{caseStatus},#{cuserid},#{cusername},#{productId},#{verNum},#{casedbId},#{casedbName},#{funcId},#{funcName},#{funcPnames},#{preRemark},#{caseType},#{cpriority},#{budgetWorkload},#{actWorkload},#{initWorkload},#{retest},#{pbranchId},#{testType}
 		)
 	</insert>
 	
@@ -164,7 +164,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		id,case_name,case_remark,test_step,expect_result,menu_id,menu_name,ctime,ltime,luserid,lusername,cbranch_id,module_id,module_name,case_status,cuserid,cusername,product_id,ver_num,casedb_id,casedb_name,func_id,func_name,func_pnames,pre_remark,case_type,cpriority,budget_workload,act_workload,init_workload,retest,pbranch_id
+		id,case_name,case_remark,test_step,expect_result,menu_id,menu_name,ctime,ltime,luserid,lusername,cbranch_id,module_id,module_name,case_status,cuserid,cusername,product_id,ver_num,casedb_id,casedb_name,func_id,func_name,func_pnames,pre_remark,case_type,cpriority,budget_workload,act_workload,init_workload,retest,pbranch_id,test_type
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -201,6 +201,7 @@
 		<if test="initWorkload != null and initWorkload != ''">      and res.init_workload = #{initWorkload}     </if>
 		<if test="retest != null and retest != ''">      and res.retest = #{retest}     </if>
 		<if test="pbranchId != null and pbranchId != ''">      and res.pbranch_id = #{pbranchId}     </if>
+		<if test="testType != null and testType != ''">      and res.test_type = #{testType}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -234,7 +235,8 @@
 		act_workload = #{actWorkload},
 		init_workload = #{initWorkload},
 		retest = #{retest},
-		pbranch_id = #{pbranchId}
+		pbranch_id = #{pbranchId},
+		test_type = #{testType}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="caseName != null and caseName != ''"> case_name = #{caseName},     </if>
@@ -268,6 +270,7 @@
 		<if test="initWorkload != null and initWorkload != ''"> init_workload = #{initWorkload},     </if>
 		<if test="retest != null and retest != ''"> retest = #{retest},     </if>
 		<if test="pbranchId != null and pbranchId != ''"> pbranch_id = #{pbranchId},     </if>
+		<if test="testType != null and testType != ''"> test_type = #{testType},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -301,6 +304,7 @@
 			act_workload = #{item.actWorkload},
 			init_workload = #{item.initWorkload},
 			retest = #{item.retest},
-			pbranch_id = #{item.pbranchId}
+			pbranch_id = #{item.pbranchId},
+			test_type = #{item.testType}
 	</sql>
 </mapper>
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanCaseMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanCaseMapper.xml
index 307b4ea8..eaf63500 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanCaseMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanCaseMapper.xml
@@ -196,7 +196,7 @@
 		insert into xm_test_plan_case(
 			<include refid="columns"/>
 		) values (
-		#{bugs},#{execUserid},#{caseId},#{ltime},#{ctime},#{execStatus},#{execUsername},#{priority},#{remark},#{testStep},#{planId},#{projectId},#{budgetWorkload},#{actWorkload},#{initWorkload},#{execDate}
+		#{bugs},#{execUserid},#{caseId},#{ltime},#{ctime},#{execStatus},#{execUsername},#{priority},#{remark},#{testStep},#{planId},#{projectId},#{budgetWorkload},#{actWorkload},#{initWorkload},#{execDate},#{execType},#{productId}
 		)
 	</insert>
 	
@@ -271,7 +271,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		bugs,exec_userid,case_id,ltime,ctime,exec_status,exec_username,priority,remark,test_step,plan_id,project_id,budget_workload,act_workload,init_workload,exec_date
+		bugs,exec_userid,case_id,ltime,ctime,exec_status,exec_username,priority,remark,test_step,plan_id,project_id,budget_workload,act_workload,init_workload,exec_date,exec_type,product_id
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -292,6 +292,8 @@
 		<if test="actWorkload != null and actWorkload != ''">      and res.act_workload = #{actWorkload}     </if>
 		<if test="initWorkload != null and initWorkload != ''">      and res.init_workload = #{initWorkload}     </if>
 		<if test="execDate != null and execDate != ''">      and res.exec_date = #{execDate}     </if>
+		<if test="execType != null and execType != ''">      and res.exec_type = #{execType}     </if>
+		<if test="productId != null and productId != ''">      and res.product_id = #{productId}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -308,7 +310,9 @@
 		budget_workload = #{budgetWorkload},
 		act_workload = #{actWorkload},
 		init_workload = #{initWorkload},
-		exec_date = #{execDate}
+		exec_date = #{execDate},
+		exec_type = #{execType},
+		product_id = #{productId}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="bugs != null and bugs != ''"> bugs = #{bugs},     </if>
@@ -325,6 +329,8 @@
 		<if test="actWorkload != null and actWorkload != ''"> act_workload = #{actWorkload},     </if>
 		<if test="initWorkload != null and initWorkload != ''"> init_workload = #{initWorkload},     </if>
 		<if test="execDate != null and execDate != ''"> exec_date = #{execDate},     </if>
+		<if test="execType != null and execType != ''"> exec_type = #{execType},     </if>
+		<if test="productId != null and productId != ''"> product_id = #{productId},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -341,6 +347,8 @@
 			budget_workload = #{item.budgetWorkload},
 			act_workload = #{item.actWorkload},
 			init_workload = #{item.initWorkload},
-			exec_date = #{item.execDate}
+			exec_date = #{item.execDate},
+			exec_type = #{item.execType},
+			product_id = #{item.productId}
 	</sql>
 </mapper>
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanMapper.xml
index 7a4f62f6..e0ab1883 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanMapper.xml
@@ -132,7 +132,7 @@
 		insert into xm_test_plan(
 			<include refid="columns"/>
 		) values (
-		#{id},#{name},#{casedbId},#{casedbName},#{projectId},#{projectName},#{cuserid},#{cusername},#{ctime},#{stime},#{etime},#{status},#{tcode},#{totalCases},#{okCases},#{errCases},#{igCases},#{blCases},#{productId},#{productName},#{flowState},#{bugCnt},#{closedBugs},#{resolvedBugs},#{activeBugs},#{confirmedBugs},#{menus},#{funcs},#{budgetWorkload},#{actWorkload},#{summaryRemark},#{cbranchId},#{toTestCases},#{pbranchId}
+		#{id},#{name},#{casedbId},#{casedbName},#{projectId},#{projectName},#{cuserid},#{cusername},#{ctime},#{stime},#{etime},#{status},#{tcode},#{totalCases},#{okCases},#{errCases},#{igCases},#{blCases},#{productId},#{productName},#{flowState},#{bugCnt},#{closedBugs},#{resolvedBugs},#{activeBugs},#{confirmedBugs},#{menus},#{funcs},#{budgetWorkload},#{actWorkload},#{summaryRemark},#{cbranchId},#{toTestCases},#{pbranchId},#{ptype}
 		)
 	</insert>
 	
@@ -207,7 +207,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		id,name,casedb_id,casedb_name,project_id,project_name,cuserid,cusername,ctime,stime,etime,status,tcode,total_cases,ok_cases,err_cases,ig_cases,bl_cases,product_id,product_name,flow_state,bug_cnt,closed_bugs,resolved_bugs,active_bugs,confirmed_bugs,menus,funcs,budget_workload,act_workload,summary_remark,cbranch_id,to_test_cases,pbranch_id
+		id,name,casedb_id,casedb_name,project_id,project_name,cuserid,cusername,ctime,stime,etime,status,tcode,total_cases,ok_cases,err_cases,ig_cases,bl_cases,product_id,product_name,flow_state,bug_cnt,closed_bugs,resolved_bugs,active_bugs,confirmed_bugs,menus,funcs,budget_workload,act_workload,summary_remark,cbranch_id,to_test_cases,pbranch_id,ptype
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -246,6 +246,7 @@
 		<if test="cbranchId != null and cbranchId != ''">      and res.cbranch_id = #{cbranchId}     </if>
 		<if test="toTestCases != null and toTestCases != ''">      and res.to_test_cases = #{toTestCases}     </if>
 		<if test="pbranchId != null and pbranchId != ''">      and res.pbranch_id = #{pbranchId}     </if>
+		<if test="ptype != null and ptype != ''">      and res.ptype = #{ptype}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -281,7 +282,8 @@
 		summary_remark = #{summaryRemark},
 		cbranch_id = #{cbranchId},
 		to_test_cases = #{toTestCases},
-		pbranch_id = #{pbranchId}
+		pbranch_id = #{pbranchId},
+		ptype = #{ptype}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="name != null and name != ''"> name = #{name},     </if>
@@ -317,6 +319,7 @@
 		<if test="cbranchId != null and cbranchId != ''"> cbranch_id = #{cbranchId},     </if>
 		<if test="toTestCases != null and toTestCases != ''"> to_test_cases = #{toTestCases},     </if>
 		<if test="pbranchId != null and pbranchId != ''"> pbranch_id = #{pbranchId},     </if>
+		<if test="ptype != null and ptype != ''"> ptype = #{ptype},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -352,6 +355,7 @@
 			summary_remark = #{item.summaryRemark},
 			cbranch_id = #{item.cbranchId},
 			to_test_cases = #{item.toTestCases},
-			pbranch_id = #{item.pbranchId}
+			pbranch_id = #{item.pbranchId},
+			ptype = #{item.ptype}
 	</sql>
 </mapper>
\ No newline at end of file