diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTaskWorkload.java b/xm-core/src/main/java/com/xm/core/entity/XmTaskWorkload.java
index ec76da94..1bf2bc79 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmTaskWorkload.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmTaskWorkload.java
@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmTaskWorkload所有属性名: <br>
- *	"userid","员工编号","username","姓名","ctime","创建日期","taskId","业务对象主键任务编号","cuserid","创建人编号","bizDate","业务日期yyyy-MM-dd","wstatus","状态0-待确认，1-已确认，2-无效","remark","备注","ttype","任务类型-关联字典taskType","id","主键","stime","结算提交时间","sstatus","结算状态0-无需结算，1-待结算2-已提交3-已通过4-已结算","workload","工时，一个task_id可多次提交，小时","rworkload","剩余工时（同一天取最后日期更新到task表budget_workload中）","cusername","创建人姓名","projectId","归属项目","branchId","项目归属机构","ubranchId","用户归属机构","sbillId","结算单编号","detailId","结算单明细表id";<br>
+ *	"userid","员工编号","username","姓名","ctime","创建日期","taskId","任务编号，任务报工必填","cuserid","创建人编号","bizDate","业务日期yyyy-MM-dd","wstatus","状态0-待确认，1-已确认，2-无效","remark","备注","ttype","任务类型-关联字典taskType","id","主键","stime","结算提交时间","sstatus","结算状态0-无需结算，1-待结算2-已提交3-已通过4-已结算","workload","工时，一个task_id可多次提交，小时","rworkload","剩余工时（同一天取最后日期更新到task表budget_workload中）","cusername","创建人姓名","projectId","归属项目","branchId","项目归属机构","ubranchId","用户归属机构","sbillId","结算单编号","detailId","结算单明细表id","menuId","需求编号，缺陷报工、测试报工、任务报工都可以填","productId","产品编号，能关联到的都填","caseId","测试用例编号(如果是测试执行报工，必填)","planId","测试计划编号(如果是测试执行报工，必填)","bugId","缺陷编号(如果是缺陷报工，必填)","bizType","报工类型1-任务，2-缺陷，3-测试用例设计，4-测试执行";<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -32,7 +32,7 @@ public class XmTaskWorkload  implements java.io.Serializable {
 	@ApiModelProperty(notes="创建日期",allowEmptyValue=true,example="",allowableValues="")
 	Date ctime;
 	
-	@ApiModelProperty(notes="业务对象主键任务编号",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="任务编号，任务报工必填",allowEmptyValue=true,example="",allowableValues="")
 	String taskId;
 	
 	@ApiModelProperty(notes="创建人编号",allowEmptyValue=true,example="",allowableValues="")
@@ -79,6 +79,24 @@ public class XmTaskWorkload  implements java.io.Serializable {
 	
 	@ApiModelProperty(notes="结算单明细表id",allowEmptyValue=true,example="",allowableValues="")
 	String detailId;
+	
+	@ApiModelProperty(notes="需求编号，缺陷报工、测试报工、任务报工都可以填",allowEmptyValue=true,example="",allowableValues="")
+	String menuId;
+	
+	@ApiModelProperty(notes="产品编号，能关联到的都填",allowEmptyValue=true,example="",allowableValues="")
+	String productId;
+	
+	@ApiModelProperty(notes="测试用例编号(如果是测试执行报工，必填)",allowEmptyValue=true,example="",allowableValues="")
+	String caseId;
+	
+	@ApiModelProperty(notes="测试计划编号(如果是测试执行报工，必填)",allowEmptyValue=true,example="",allowableValues="")
+	String planId;
+	
+	@ApiModelProperty(notes="缺陷编号(如果是缺陷报工，必填)",allowEmptyValue=true,example="",allowableValues="")
+	String bugId;
+	
+	@ApiModelProperty(notes="报工类型1-任务，2-缺陷，3-测试用例设计，4-测试执行",allowEmptyValue=true,example="",allowableValues="")
+	String bizType;
 
 	/**
 	 *主键
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml
index d6ab8562..0275ceb2 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml
@@ -285,7 +285,7 @@
 		insert into xm_task_workload(
 			<include refid="columns"/>
 		) values (
-		#{userid},#{username},#{ctime},#{taskId},#{cuserid},#{bizDate},#{wstatus},#{remark},#{ttype},#{id},#{stime},#{sstatus},#{workload},#{rworkload},#{cusername},#{projectId},#{branchId},#{ubranchId},#{sbillId},#{detailId}
+		#{userid},#{username},#{ctime},#{taskId},#{cuserid},#{bizDate},#{wstatus},#{remark},#{ttype},#{id},#{stime},#{sstatus},#{workload},#{rworkload},#{cusername},#{projectId},#{branchId},#{ubranchId},#{sbillId},#{detailId},#{menuId},#{productId},#{caseId},#{planId},#{bugId},#{bizType}
 		)
 	</insert>
 	
@@ -360,7 +360,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		userid,username,ctime,task_id,cuserid,biz_date,wstatus,remark,ttype,id,stime,sstatus,workload,rworkload,cusername,project_id,branch_id,ubranch_id,sbill_id,detail_id
+		userid,username,ctime,task_id,cuserid,biz_date,wstatus,remark,ttype,id,stime,sstatus,workload,rworkload,cusername,project_id,branch_id,ubranch_id,sbill_id,detail_id,menu_id,product_id,case_id,plan_id,bug_id,biz_type
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -385,6 +385,12 @@
 		<if test="ubranchId != null and ubranchId != ''">      and res.ubranch_id = #{ubranchId}     </if>
 		<if test="sbillId != null and sbillId != ''">      and res.sbill_id = #{sbillId}     </if>
 		<if test="detailId != null and detailId != ''">      and res.detail_id = #{detailId}     </if>
+		<if test="menuId != null and menuId != ''">      and res.menu_id = #{menuId}     </if>
+		<if test="productId != null and productId != ''">      and res.product_id = #{productId}     </if>
+		<if test="caseId != null and caseId != ''">      and res.case_id = #{caseId}     </if>
+		<if test="planId != null and planId != ''">      and res.plan_id = #{planId}     </if>
+		<if test="bugId != null and bugId != ''">      and res.bug_id = #{bugId}     </if>
+		<if test="bizType != null and bizType != ''">      and res.biz_type = #{bizType}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -406,7 +412,13 @@
 		branch_id = #{branchId},
 		ubranch_id = #{ubranchId},
 		sbill_id = #{sbillId},
-		detail_id = #{detailId}
+		detail_id = #{detailId},
+		menu_id = #{menuId},
+		product_id = #{productId},
+		case_id = #{caseId},
+		plan_id = #{planId},
+		bug_id = #{bugId},
+		biz_type = #{bizType}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="userid != null and userid != ''"> userid = #{userid},     </if>
@@ -428,6 +440,12 @@
 		<if test="ubranchId != null and ubranchId != ''"> ubranch_id = #{ubranchId},     </if>
 		<if test="sbillId != null and sbillId != ''"> sbill_id = #{sbillId},     </if>
 		<if test="detailId != null and detailId != ''"> detail_id = #{detailId},     </if>
+		<if test="menuId != null and menuId != ''"> menu_id = #{menuId},     </if>
+		<if test="productId != null and productId != ''"> product_id = #{productId},     </if>
+		<if test="caseId != null and caseId != ''"> case_id = #{caseId},     </if>
+		<if test="planId != null and planId != ''"> plan_id = #{planId},     </if>
+		<if test="bugId != null and bugId != ''"> bug_id = #{bugId},     </if>
+		<if test="bizType != null and bizType != ''"> biz_type = #{bizType},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -449,6 +467,12 @@
 			branch_id = #{item.branchId},
 			ubranch_id = #{item.ubranchId},
 			sbill_id = #{item.sbillId},
-			detail_id = #{item.detailId}
+			detail_id = #{item.detailId},
+			menu_id = #{item.menuId},
+			product_id = #{item.productId},
+			case_id = #{item.caseId},
+			plan_id = #{item.planId},
+			bug_id = #{item.bugId},
+			biz_type = #{item.bizType}
 	</sql>
 </mapper>
\ No newline at end of file