diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java
index 7958dcd6..45f28369 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java
@@ -71,10 +71,10 @@ public class XmTaskExecuserService extends BaseService<XmTaskExecuserMapper,XmTa
 		User user = LoginUtils.getCurrentUserInfo();
 		XmTaskExecuser xmTaskExecuserQuery=new XmTaskExecuser();
 		xmTaskExecuserQuery.setTaskId(xmTaskExecuser.getTaskId());
-		xmTaskExecuserQuery.setUserid(xmTaskExecuser.getUserid()); 
+		xmTaskExecuserQuery.setBidUserid(xmTaskExecuser.getBidUserid()); 
 		List<XmTaskExecuser> userDb=this.selectListByWhere(xmTaskExecuserQuery);
 		if(userDb.size()>0) {
-			throw new BizException(xmTaskExecuser.getUsername()+"已在任务中，不允许再添加");
+			throw new BizException(xmTaskExecuser.getBidUsername()+"已在任务中，不允许再添加");
 		}
 		xmTaskExecuser.setCreateUserid(user.getUserid());
 		xmTaskExecuser.setCreateUsername(user.getUsername());
@@ -90,18 +90,18 @@ public class XmTaskExecuserService extends BaseService<XmTaskExecuserMapper,XmTa
 		updateXmTaskExeUseridsAndUsernamesByTaskId(xmTaskExecuser.getTaskId());
 		if(sendMsg){//草稿任务不要提醒
 			if("0".equals(xmTaskExecuser.getStatus())){
-				imMsg=xmTaskExecuser.getUsername()+"成为任务【"+xmTaskExecuser.getTaskId()+"-"+xmTaskExecuser.getTaskName()+"】的候选人，待雇主选标。";
+				imMsg=xmTaskExecuser.getBidUsername()+"成为任务【"+xmTaskExecuser.getTaskId()+"-"+xmTaskExecuser.getTaskName()+"】的候选人，待雇主选标。";
 				notifyMsg="您成为任务【"+xmTaskExecuser.getTaskId()+"-"+xmTaskExecuser.getTaskName()+"】的候选人，请等待雇主选标，在雇主选标前，您还可以修改报价，合理的报价更容易获得雇主的喜欢哦！";
 			}else {
-				imMsg=xmTaskExecuser.getUsername()+"成为任务【"+xmTaskExecuser.getTaskId()+"-"+xmTaskExecuser.getTaskName()+"】的执行人，请及时跟进任务！";
+				imMsg=xmTaskExecuser.getBidUsername()+"成为任务【"+xmTaskExecuser.getTaskId()+"-"+xmTaskExecuser.getTaskName()+"】的执行人，请及时跟进任务！";
 				notifyMsg="您成为任务【"+xmTaskExecuser.getTaskId()+"-"+xmTaskExecuser.getTaskName()+"】的执行人，请及时跟进任务！";
 			}
-			this.pushMsgService.pushPrichatMsgToIm(user.getBranchId(),user.getUserid(),user.getUsername(), xmTaskExecuser.getUserid(), xmTaskExecuser.getUsername(),imMsg);
-			this.pushMsgService.pushCreateCssGroupMsg(user.getBranchId(), xmTaskExecuser.getUserid(), xmTaskExecuser.getUsername(), imMsg);
-			notifyMsgService.pushMsg(user, xmTaskExecuser.getUserid(), xmTaskExecuser.getUsername(),  notifyMsg,null);
+			this.pushMsgService.pushPrichatMsgToIm(user.getBranchId(),user.getUserid(),user.getUsername(), xmTaskExecuser.getBidUserid(), xmTaskExecuser.getBidUsername(),imMsg);
+			this.pushMsgService.pushCreateCssGroupMsg(user.getBranchId(), xmTaskExecuser.getBidUserid(), xmTaskExecuser.getBidUsername(), imMsg);
+			notifyMsgService.pushMsg(user, xmTaskExecuser.getBidUserid(), xmTaskExecuser.getBidUsername(),  notifyMsg,null);
 
 		}
-		xmRecordService.addXmTaskRecord(xmTaskExecuser.getProjectId(), xmTaskExecuser.getTaskId(), "项目-任务-增加候选人", "任务增加候选人"+xmTaskExecuser.getUsername(),JSONObject.toJSONString(xmTaskExecuser),null);
+		xmRecordService.addXmTaskRecord(xmTaskExecuser.getProjectId(), xmTaskExecuser.getTaskId(), "项目-任务-增加候选人", "任务增加候选人"+xmTaskExecuser.getBidUsername(),JSONObject.toJSONString(xmTaskExecuser),null);
 	}
 	/**
 	 * 本人或者组长可以变更
@@ -115,33 +115,33 @@ public class XmTaskExecuserService extends BaseService<XmTaskExecuserMapper,XmTa
 		 User user=LoginUtils.getCurrentUserInfo();
 		 List<XmGroupVo> pgroups=groupService.getProjectGroupVoList(projectId);
  		for (XmTaskExecuser xmTaskExecuser : xmTaskExecuserList) {
-			List<XmGroupVo> userGroups=groupService.getUserGroups(pgroups, xmTaskExecuser.getUserid());
+			List<XmGroupVo> userGroups=groupService.getUserGroups(pgroups, xmTaskExecuser.getBidUserid());
 			XmTaskExecuser xmTaskExecuser2=new XmTaskExecuser();
 			xmTaskExecuser2.setTaskId(xmTaskExecuser.getTaskId());
-			xmTaskExecuser2.setUserid(xmTaskExecuser.getUserid());
+			xmTaskExecuser2.setBidUserid(xmTaskExecuser.getBidUserid());
 			xmTaskExecuser2.setStatus("7");
 			this.updateSomeFieldByPk(xmTaskExecuser2);
 			projectId=xmTaskExecuser.getProjectId();
 			taskId=xmTaskExecuser.getTaskId(); 
-			usernames.add(xmTaskExecuser.getUsername());
+			usernames.add(xmTaskExecuser.getBidUsername());
 			
 			/**
 			 * 下面为推送任务执行人变更im通知消息
 			 */
 			List<Map<String,Object>> users=new ArrayList<>();
 			Map<String,Object> userMap=new HashMap<>();
-			userMap.put("userid", xmTaskExecuser.getUserid());
-			userMap.put("username", xmTaskExecuser.getUsername());
+			userMap.put("userid", xmTaskExecuser.getBidUserid());
+			userMap.put("username", xmTaskExecuser.getBidUsername());
 			users.add(userMap);
-			String imMsg=xmTaskExecuser.getUsername()+"放弃任务【"+xmTaskExecuser.getTaskId()+"-"+xmTaskExecuser.getTaskName()+"】";
-			notifyMsgService.pushMsg(user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),"您已离开任务【"+xmTaskExecuser.getTaskId()+"-"+xmTaskExecuser.getTaskName()+"】！",null);
+			String imMsg=xmTaskExecuser.getBidUsername()+"放弃任务【"+xmTaskExecuser.getTaskId()+"-"+xmTaskExecuser.getTaskName()+"】";
+			notifyMsgService.pushMsg(user,xmTaskExecuser.getBidUserid(),xmTaskExecuser.getBidUsername(),"您已离开任务【"+xmTaskExecuser.getTaskId()+"-"+xmTaskExecuser.getTaskName()+"】！",null);
 
 			for (XmGroupVo g : userGroups) {
-				this.pushMsgService.pushGroupMsg(user.getBranchId(), g.getId(), xmTaskExecuser.getUserid(), xmTaskExecuser.getUsername(),  imMsg);
+				this.pushMsgService.pushGroupMsg(user.getBranchId(), g.getId(), xmTaskExecuser.getBidUserid(), xmTaskExecuser.getBidUsername(),  imMsg);
  				this.pushMsgService.pushLeaveChannelGroupMsg(user.getBranchId(), g.getId(), users);
 
 			}
-			this.pushMsgService.pushCssMsg(user.getBranchId(), xmTaskExecuser.getUserid(), xmTaskExecuser.getUsername(), imMsg);
+			this.pushMsgService.pushCssMsg(user.getBranchId(), xmTaskExecuser.getBidUserid(), xmTaskExecuser.getBidUsername(), imMsg);
 
 		}  
 			updateXmTaskExeUseridsAndUsernamesByTaskId(taskId);
@@ -164,20 +164,20 @@ public class XmTaskExecuserService extends BaseService<XmTaskExecuserMapper,XmTa
  		 List<XmGroupVo> pgroups=groupService.getProjectGroupVoList(projectId);
 		 User user=LoginUtils.getCurrentUserInfo();
  
- 		List<XmGroupVo> userGroups=groupService.getUserGroups(pgroups, xmTaskExecuser.getUserid());
+ 		List<XmGroupVo> userGroups=groupService.getUserGroups(pgroups, xmTaskExecuser.getBidUserid());
  		XmTaskExecuser query=new XmTaskExecuser(); 
  		query.setTaskId(taskId);
 		XmTaskExecuser xmTaskExecuserDb=null;
  		 List<XmTaskExecuser> xmTaskExecusersDb=this.selectListByWhere(query);
  		 if(xmTaskExecusersDb !=null && xmTaskExecusersDb.size()>0) {
  			 for (XmTaskExecuser exe : xmTaskExecusersDb) {
-				if(!xmTaskExecuser.getUserid().equals(exe.getUserid())) {
+				if(!xmTaskExecuser.getBidUserid().equals(exe.getBidUserid())) {
 					if(!"0".equals(exe.getStatus()) && !"7".equals(exe.getStatus())) {
-						throw new BizException(exe.getUsername()+"是当前执行人，不允许再添加其它执行人");
+						throw new BizException(exe.getBidUsername()+"是当前执行人，不允许再添加其它执行人");
 					}
 				}else {
 					if(!"0".equals(exe.getStatus()) && !"7".equals(exe.getStatus())) {
-						throw new BizException(exe.getUsername()+"不是候选人，不允许变更为执行人");
+						throw new BizException(exe.getBidUsername()+"不是候选人，不允许变更为执行人");
 					}
 					xmTaskExecuserDb=exe;
 				}
@@ -185,36 +185,36 @@ public class XmTaskExecuserService extends BaseService<XmTaskExecuserMapper,XmTa
  		 }
 
  		 if(xmTaskExecuserDb==null){
-			 throw new BizException(xmTaskExecuser.getUsername()+"不是候选人，不允许变更为执行人");
+			 throw new BizException(xmTaskExecuser.getBidUsername()+"不是候选人，不允许变更为执行人");
 		 }
  		 if( "1".equals(xmTaskDb.getCrowd()) && "1".equals(xmTaskDb.getTaskOut()) ){
 			 if(xmTaskExecuserDb.getQuoteAmount()==null){
-				 throw new BizException(xmTaskExecuserDb.getUsername()+"没有填写报价金额，不允许变更为执行人。");
+				 throw new BizException(xmTaskExecuserDb.getBidUsername()+"没有填写报价金额，不允许变更为执行人。");
 			 }
 		 }
  		 XmTaskExecuser xmTaskExecuser2=new XmTaskExecuser();
 		xmTaskExecuser2.setTaskId(xmTaskExecuser.getTaskId());
-		xmTaskExecuser2.setUserid(xmTaskExecuser.getUserid());
+		xmTaskExecuser2.setBidUserid(xmTaskExecuser.getBidUserid());
 			xmTaskExecuser2.setStatus("1");
 			this.updateSomeFieldByPk(xmTaskExecuser2);
 			/** 
 			 * 下面为推送任务执行人变更im通知消息
 			 */
- 			String imMsg=xmTaskExecuser.getUsername()+"变更为任务["+xmTaskDb.getId()+"-"+xmTaskDb.getName()+"]执行人";
+ 			String imMsg=xmTaskExecuser.getBidUsername()+"变更为任务["+xmTaskDb.getId()+"-"+xmTaskDb.getName()+"]执行人";
 			for (XmGroupVo g : userGroups) {
-				this.pushMsgService.pushGroupMsg(user.getBranchId(),g.getId(),  xmTaskExecuser.getUserid(), xmTaskExecuser.getUsername(),imMsg );
-				this.pushMsgService.pushPrichatMsgToIm(user.getBranchId(), user.getUserid(),user.getUsername(),xmTaskExecuser.getUserid(), xmTaskExecuser.getUsername(),imMsg);
+				this.pushMsgService.pushGroupMsg(user.getBranchId(),g.getId(),  xmTaskExecuser.getBidUserid(), xmTaskExecuser.getBidUsername(),imMsg );
+				this.pushMsgService.pushPrichatMsgToIm(user.getBranchId(), user.getUserid(),user.getUsername(),xmTaskExecuser.getBidUserid(), xmTaskExecuser.getBidUsername(),imMsg);
 			}
-			this.pushMsgService.pushCssMsg(user.getBranchId(), xmTaskExecuser.getUserid(), xmTaskExecuser.getUsername(), imMsg);
+			this.pushMsgService.pushCssMsg(user.getBranchId(), xmTaskExecuser.getBidUserid(), xmTaskExecuser.getBidUsername(), imMsg);
 
-			notifyMsgService.pushMsg(user, xmTaskExecuser.getUserid(), xmTaskExecuser.getUsername(), "恭喜您被雇主选为任务【" + xmTaskExecuser.getTaskId() + "-" + xmTaskDb.getName() + "】的中标人,请尽快开展工作。",null);
+			notifyMsgService.pushMsg(user, xmTaskExecuser.getBidUserid(), xmTaskExecuser.getBidUsername(), "恭喜您被雇主选为任务【" + xmTaskExecuser.getTaskId() + "-" + xmTaskDb.getName() + "】的中标人,请尽快开展工作。",null);
 
 			updateXmTaskExeUseridsAndUsernamesByTaskId(taskId);
 			if("2".equals(xmTaskDb.getOshare()) && xmTaskDb.getShareFee()!=null && xmTaskDb.getShareFee().compareTo(BigDecimal.ZERO)>0){
-				mkClient.pushAfterTaskExecSuccess(xmTaskExecuserDb.getUserid(),xmTaskExecuserDb.getUsername(),xmTaskDb.getProjectId(),xmTaskDb.getId(),xmTaskDb.getShareFee());
+				mkClient.pushAfterTaskExecSuccess(xmTaskExecuserDb.getBidUserid(),xmTaskExecuserDb.getBidUsername(),xmTaskDb.getProjectId(),xmTaskDb.getId(),xmTaskDb.getShareFee());
 			}
 
- 		xmRecordService.addXmTaskRecord(projectId, taskId, "项目-任务-变更为执行人", xmTaskExecuser.getUsername()+"变更为任务执行人",null,null);
+ 		xmRecordService.addXmTaskRecord(projectId, taskId, "项目-任务-变更为执行人", xmTaskExecuser.getBidUsername()+"变更为任务执行人",null,null);
 	}
 
 	
@@ -224,7 +224,7 @@ public class XmTaskExecuserService extends BaseService<XmTaskExecuserMapper,XmTa
 	public void becomeCandidate(XmTaskExecuser xmTaskExecuser) {
 		XmTaskExecuser xmTaskExecuserNew=new XmTaskExecuser();
 		xmTaskExecuserNew.setTaskId(xmTaskExecuser.getTaskId());
-		xmTaskExecuserNew.setUserid(xmTaskExecuser.getUserid());
+		xmTaskExecuserNew.setBidUserid(xmTaskExecuser.getBidUserid());
  		xmTaskExecuserNew.setQuoteWeekday(xmTaskExecuser.getQuoteWeekday());
 		xmTaskExecuserNew.setQuoteWorkload(xmTaskExecuser.getQuoteWorkload());
 		xmTaskExecuserNew.setQuoteAmount(xmTaskExecuser.getQuoteAmount());
@@ -234,16 +234,16 @@ public class XmTaskExecuserService extends BaseService<XmTaskExecuserMapper,XmTa
 		xmTaskExecuserNew.setStatus("0");
 		this.updateSomeFieldByPk(xmTaskExecuserNew);
 		updateXmTaskExeUseridsAndUsernamesByTaskId(xmTaskExecuser.getTaskId());
-		this.pushMsgService.pushCssMsg(xmTaskExecuser.getBranchId(), xmTaskExecuser.getUserid(), xmTaskExecuser.getUsername(),  xmTaskExecuser.getUsername()+"变更为候选人并提交关于任务【"+xmTaskExecuser.getTaskId()+"-"+xmTaskExecuser.getTaskName()+"】报价信息");
+		this.pushMsgService.pushCssMsg(xmTaskExecuser.getBranchId(), xmTaskExecuser.getBidUserid(), xmTaskExecuser.getBidUsername(),  xmTaskExecuser.getBidUsername()+"变更为候选人并提交关于任务【"+xmTaskExecuser.getTaskId()+"-"+xmTaskExecuser.getTaskName()+"】报价信息");
 		User user=LoginUtils.getCurrentUserInfo();
-		notifyMsgService.pushMsg(user, xmTaskExecuser.getUserid(), xmTaskExecuser.getUsername(), "您成为任务【" + xmTaskExecuser.getTaskId() + "-" + xmTaskExecuser.getTaskName() + "】的候选人，请等待雇主选标，在雇主选标前，您还可以修改报价，合理的报价更容易获得雇主的喜欢哦！",null);
+		notifyMsgService.pushMsg(user, xmTaskExecuser.getBidUserid(), xmTaskExecuser.getBidUsername(), "您成为任务【" + xmTaskExecuser.getTaskId() + "-" + xmTaskExecuser.getTaskName() + "】的候选人，请等待雇主选标，在雇主选标前，您还可以修改报价，合理的报价更容易获得雇主的喜欢哦！",null);
 
-		xmRecordService.addXmTaskRecord(xmTaskExecuser.getProjectId(), xmTaskExecuser.getTaskId(), "项目-任务-候选人报价", xmTaskExecuser.getUsername()+"变更为候选人并提交报价信息",JSONObject.toJSONString(xmTaskExecuser),null);
+		xmRecordService.addXmTaskRecord(xmTaskExecuser.getProjectId(), xmTaskExecuser.getTaskId(), "项目-任务-候选人报价", xmTaskExecuser.getBidUsername()+"变更为候选人并提交报价信息",JSONObject.toJSONString(xmTaskExecuser),null);
 	}
 	public void quotePrice(XmTaskExecuser xmTaskExecuser) {
 		XmTaskExecuser xmTaskExecuserNew=new XmTaskExecuser();
 		xmTaskExecuserNew.setTaskId(xmTaskExecuser.getTaskId());
-		xmTaskExecuserNew.setUserid(xmTaskExecuser.getUserid());
+		xmTaskExecuserNew.setBidUserid(xmTaskExecuser.getBidUserid());
 		xmTaskExecuserNew.setQuoteWeekday(xmTaskExecuser.getQuoteWeekday());
 		xmTaskExecuserNew.setQuoteWorkload(xmTaskExecuser.getQuoteWorkload());
 		xmTaskExecuserNew.setQuoteAmount(xmTaskExecuser.getQuoteAmount());
@@ -251,11 +251,11 @@ public class XmTaskExecuserService extends BaseService<XmTaskExecuserMapper,XmTa
 		xmTaskExecuserNew.setQuoteStartTime(xmTaskExecuser.getQuoteStartTime());
 		xmTaskExecuserNew.setSkillRemark(xmTaskExecuser.getSkillRemark()); 
 		this.updateSomeFieldByPk(xmTaskExecuserNew);
-		this.pushMsgService.pushCssMsg(xmTaskExecuser.getBranchId(), xmTaskExecuser.getUserid(), xmTaskExecuser.getUsername(),  xmTaskExecuser.getUsername()+"提交关于任务【"+xmTaskExecuser.getTaskId()+"-"+xmTaskExecuser.getTaskName()+"】报价信息");
+		this.pushMsgService.pushCssMsg(xmTaskExecuser.getBranchId(), xmTaskExecuser.getBidUserid(), xmTaskExecuser.getBidUsername(),  xmTaskExecuser.getBidUsername()+"提交关于任务【"+xmTaskExecuser.getTaskId()+"-"+xmTaskExecuser.getTaskName()+"】报价信息");
 		User user=LoginUtils.getCurrentUserInfo();
-		notifyMsgService.pushMsg(user, xmTaskExecuser.getUserid(), xmTaskExecuser.getUsername(),  user.getUsername()+"成功修改了任务【" + xmTaskExecuser.getTaskId() + "-" + xmTaskExecuser.getTaskName() + "】的报价信息，请等待雇主选标，在雇主选标前，您还可以修改报价，合理的报价更容易获得雇主的喜欢哦！",null);
+		notifyMsgService.pushMsg(user, xmTaskExecuser.getBidUserid(), xmTaskExecuser.getBidUsername(),  user.getUsername()+"成功修改了任务【" + xmTaskExecuser.getTaskId() + "-" + xmTaskExecuser.getTaskName() + "】的报价信息，请等待雇主选标，在雇主选标前，您还可以修改报价，合理的报价更容易获得雇主的喜欢哦！",null);
 
-		xmRecordService.addXmTaskRecord(xmTaskExecuser.getProjectId(), xmTaskExecuser.getTaskId(), "项目-任务-候选人报价", xmTaskExecuser.getUsername()+"提交报价信息",JSONObject.toJSONString(xmTaskExecuser),null);
+		xmRecordService.addXmTaskRecord(xmTaskExecuser.getProjectId(), xmTaskExecuser.getTaskId(), "项目-任务-候选人报价", xmTaskExecuser.getBidUsername()+"提交报价信息",JSONObject.toJSONString(xmTaskExecuser),null);
 	}
 
 
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskWorkloadService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskWorkloadService.java
deleted file mode 100644
index d6d8437c..00000000
--- a/xm-core/src/main/java/com/xm/core/service/XmTaskWorkloadService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.xm.core.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import java.util.List;
-import java.util.Map;
-import org.springframework.stereotype.Service;
-import com.mdp.core.service.BaseService;
-
-/**
- * @author maimeng-mdp code-gen
- * @since 2023-10-3
- */
-@Service
-public class XmTaskWorkloadService extends BaseService<XmTaskWorkloadMapper,XmTaskWorkload> {
-	static Logger logger =LoggerFactory.getLogger(XmTaskWorkloadService.class);
-
-	/**
-	 * 自定义查询，支持多表关联
-	 * @param page 分页条件
-	 * @param ew 一定要，并且必须加@Param("ew")注解
-	 * @param ext 如果xml中需要根据某些值进行特殊处理，可以通过这个进行传递，非必须，注解也可以不加
-	 * @return
-	 */
-	public List<Map<String,Object>> selectListMapByWhere(IPage page, QueryWrapper ew, Map<String,Object> ext){
-		return baseMapper.selectListMapByWhere(page,ew,ext);
-	}
-}
-