diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTaskOrder.java b/xm-core/src/main/java/com/xm/core/entity/XmTaskOrder.java
index e2a3d6b1..394c6419 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmTaskOrder.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmTaskOrder.java
@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmTaskOrder所有属性名: <br>
- *	"userid","用户编号","branchId","公司ID-下单客户对应的企业","ostatus","订单状态0-初始，1-待确认，2-待付款，3-已付款，4-已完成，5-已取消-未付款前可取消，取消后可删除，6-退单-退单后变为已取消，8已关闭-售后完成后可以关闭订单","ctime","创建时间","ltime","更新时间","payType","支付方式","payStatus","支付状态0待付款，1已付款","payTime","支付时间","prepayId","第三方支付订单编号","id","订单编号","finalFee","最终总费用=origin_fee","othFee","其它费用","originFee","原始价格=top_fee+urgent_fee+crm_sup_fee+hot_fee+efunds","payAt","最终付款金额-客户付款后回填","payAuthId","支付授权码","payOpenid","支付账户对应的第三方openid,注意，下单根付款不一定是同一个人","payUserid","付款用户编号","payUsername","付款用户名称","discount","折扣率0-199","topFee","置顶费用","topStime","置顶开始时间","topEtime","置顶结束时间","hotFee","热搜费用","hotStime","热搜开始时间","hotEtime","热搜结束时间","top","是否置顶","hot","是否热搜","crmSupFee","客服包办费用","urgentFee","加急费用","urgent","是否加急","crmSup","是否客服包办","efunds","托管金额","estate","资金托管状况0-无须托管，1-已托管，2-已付款给服务商，3-已退款","etoPlatTime","托管资金付款给平台的时间","etoDevTime","托管资金支付给服务商的时间","ebackTime","托管资金退回甲方时间","taskId","任务编号","topDays","置顶天数","hotDays","热搜天数","urgentDays","加急天数","urgentStime","加急开始时间","urgentEtime","加急结束时间","calcStatus","定时检查日期是否已过期，已过期则取消任务中的置顶、加急、热搜状态计算状态0-无须计算，1-本周期已计算待下周期计算，2-结束","calcTime","计算时间";<br>
+ *	"userid","用户编号","branchId","公司ID-下单客户对应的企业","ostatus","订单状态0-初始，1-待确认，2-待付款，3-已付款，4-已完成，5-已取消-未付款前可取消，取消后可删除，6-退单-退单后变为已取消，8已关闭-售后完成后可以关闭订单","ctime","创建时间","ltime","更新时间","payType","支付方式","payStatus","支付状态0待付款，1已付款","payTime","支付时间","prepayId","第三方支付订单编号","id","订单编号","finalFee","最终总费用=origin_fee","othFee","其它费用","originFee","原始价格=top_fee+urgent_fee+crm_sup_fee+hot_fee+efunds+share_fee","payAt","最终付款金额-客户付款后回填","payAuthId","支付授权码","payOpenid","支付账户对应的第三方openid,注意，下单根付款不一定是同一个人","payUserid","付款用户编号","payUsername","付款用户名称","discount","折扣率0-199","topFee","置顶费用","topStime","置顶开始时间","topEtime","置顶结束时间","hotFee","热搜费用","hotStime","热搜开始时间","hotEtime","热搜结束时间","top","是否置顶","hot","是否热搜","crmSupFee","客服包办费用","urgentFee","加急费用","urgent","是否加急","crmSup","是否客服包办","efunds","托管金额","estate","资金托管状况0-无须托管，1-已托管，2-已付款给服务商，3-已退款","etoPlatTime","托管资金付款给平台的时间","etoDevTime","托管资金支付给服务商的时间","ebackTime","托管资金退回甲方时间","taskId","任务编号","topDays","置顶天数","hotDays","热搜天数","urgentDays","加急天数","urgentStime","加急开始时间","urgentEtime","加急结束时间","calcStatus","定时检查日期是否已过期，已过期则取消任务中的置顶、加急、热搜状态计算状态0-无须计算，1-本周期已计算待下周期计算，2-结束","calcTime","计算时间","oshare","是否开启分享赚","shareFee","分享赚佣金";<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -56,7 +56,7 @@ public class XmTaskOrder  implements java.io.Serializable {
 	@ApiModelProperty(notes="其它费用",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal othFee;
 	
-	@ApiModelProperty(notes="原始价格=top_fee+urgent_fee+crm_sup_fee+hot_fee+efunds",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="原始价格=top_fee+urgent_fee+crm_sup_fee+hot_fee+efunds+share_fee",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal originFee;
 	
 	@ApiModelProperty(notes="最终付款金额-客户付款后回填",allowEmptyValue=true,example="",allowableValues="")
@@ -151,6 +151,12 @@ public class XmTaskOrder  implements java.io.Serializable {
 	
 	@ApiModelProperty(notes="计算时间",allowEmptyValue=true,example="",allowableValues="")
 	Date calcTime;
+	
+	@ApiModelProperty(notes="是否开启分享赚",allowEmptyValue=true,example="",allowableValues="")
+	String oshare;
+	
+	@ApiModelProperty(notes="分享赚佣金",allowEmptyValue=true,example="",allowableValues="")
+	BigDecimal shareFee;
 
 	/**
 	 *订单编号
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskOrderMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskOrderMapper.xml
index f1d989ed..4ee77141 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskOrderMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskOrderMapper.xml
@@ -67,7 +67,7 @@
 		insert into xm_task_order(
 			<include refid="columns"/>
 		) values (
-		#{userid},#{branchId},#{ostatus},#{ctime},#{ltime},#{payType},#{payStatus},#{payTime},#{prepayId},#{id},#{finalFee},#{othFee},#{originFee},#{payAt},#{payAuthId},#{payOpenid},#{payUserid},#{payUsername},#{discount},#{topFee},#{topStime},#{topEtime},#{hotFee},#{hotStime},#{hotEtime},#{top},#{hot},#{crmSupFee},#{urgentFee},#{urgent},#{crmSup},#{efunds},#{estate},#{etoPlatTime},#{etoDevTime},#{ebackTime},#{taskId},#{topDays},#{hotDays},#{urgentDays},#{urgentStime},#{urgentEtime},#{calcStatus},#{calcTime}
+		#{userid},#{branchId},#{ostatus},#{ctime},#{ltime},#{payType},#{payStatus},#{payTime},#{prepayId},#{id},#{finalFee},#{othFee},#{originFee},#{payAt},#{payAuthId},#{payOpenid},#{payUserid},#{payUsername},#{discount},#{topFee},#{topStime},#{topEtime},#{hotFee},#{hotStime},#{hotEtime},#{top},#{hot},#{crmSupFee},#{urgentFee},#{urgent},#{crmSup},#{efunds},#{estate},#{etoPlatTime},#{etoDevTime},#{ebackTime},#{taskId},#{topDays},#{hotDays},#{urgentDays},#{urgentStime},#{urgentEtime},#{calcStatus},#{calcTime},#{oshare},#{shareFee}
 		)
 	</insert>
 	
@@ -142,7 +142,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		userid,branch_id,ostatus,ctime,ltime,pay_type,pay_status,pay_time,prepay_id,id,final_fee,oth_fee,origin_fee,pay_at,pay_auth_id,pay_openid,pay_userid,pay_username,discount,top_fee,top_stime,top_etime,hot_fee,hot_stime,hot_etime,top,hot,crm_sup_fee,urgent_fee,urgent,crm_sup,efunds,estate,eto_plat_time,eto_dev_time,eback_time,task_id,top_days,hot_days,urgent_days,urgent_stime,urgent_etime,calc_status,calc_time
+		userid,branch_id,ostatus,ctime,ltime,pay_type,pay_status,pay_time,prepay_id,id,final_fee,oth_fee,origin_fee,pay_at,pay_auth_id,pay_openid,pay_userid,pay_username,discount,top_fee,top_stime,top_etime,hot_fee,hot_stime,hot_etime,top,hot,crm_sup_fee,urgent_fee,urgent,crm_sup,efunds,estate,eto_plat_time,eto_dev_time,eback_time,task_id,top_days,hot_days,urgent_days,urgent_stime,urgent_etime,calc_status,calc_time,oshare,share_fee
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -191,6 +191,8 @@
 		<if test="urgentEtime != null">      and date_format(res.urgent_etime,'%Y-%m-%d') = date_format(#{urgentEtime},'%Y-%m-%d')     </if>
 		<if test="calcStatus != null and calcStatus != ''">      and res.calc_status = #{calcStatus}     </if>
 		<if test="calcTime != null">      and date_format(res.calc_time,'%Y-%m-%d') = date_format(#{calcTime},'%Y-%m-%d')     </if>
+		<if test="oshare != null and oshare != ''">      and res.oshare = #{oshare}     </if>
+		<if test="shareFee != null and shareFee != ''">      and res.share_fee = #{shareFee}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -236,7 +238,9 @@
 		urgent_stime = #{urgentStime},
 		urgent_etime = #{urgentEtime},
 		calc_status = #{calcStatus},
-		calc_time = #{calcTime}
+		calc_time = #{calcTime},
+		oshare = #{oshare},
+		share_fee = #{shareFee}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="userid != null and userid != ''"> userid = #{userid},     </if>
@@ -282,6 +286,8 @@
 		<if test="urgentEtime != null"> urgent_etime = #{urgentEtime},     </if>
 		<if test="calcStatus != null and calcStatus != ''"> calc_status = #{calcStatus},     </if>
 		<if test="calcTime != null"> calc_time = #{calcTime},     </if>
+		<if test="oshare != null and oshare != ''"> oshare = #{oshare},     </if>
+		<if test="shareFee != null and shareFee != ''"> share_fee = #{shareFee},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -327,6 +333,8 @@
 			urgent_stime = #{item.urgentStime},
 			urgent_etime = #{item.urgentEtime},
 			calc_status = #{item.calcStatus},
-			calc_time = #{item.calcTime}
+			calc_time = #{item.calcTime},
+			oshare = #{item.oshare},
+			share_fee = #{item.shareFee}
 	</sql>
 </mapper>
\ No newline at end of file