Merge branch 'master' of http://192.168.2.4:3000/chengqiang/total_process

src/main/java/com/jeeplus/modules/workbidproject/service/WorkBidProjectService.java

@@ -777,8 +777,8 @@ public class WorkBidProjectService extends CrudService<WorkBidProjectDao, WorkBi
 						notifyRole = "市场研发管理部负责人审批";
 						workActivityProcess.setIsApproval("1");
 						enname = "scyfglbzr";
-						vars.put("scyfglbzrcount",auditUsers.size());
-						vars.put("scyfglbzrList",auditUsers);
+						vars.put("scyfglbzrscount",auditUsers.size());
+						vars.put("scyfglbzrsList",auditUsers);
 					} else {
 						notifyRole = "调整申请";
 						workActivityProcess.setIsApproval("2");

src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java

@@ -1319,8 +1319,6 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 						notifyRole = "市场研发管理部负责人";
 						workActivityProcess.setIsApproval("1");
 						enname = "scyfglbzr";
-						vars.put("scyfglbzrscount",auditUsers.size());
-						vars.put("scyfglbzrsList",auditUsers);
 
 
 					} else {