Merge branch 'feat-fixtaskapprove-210915' of googol/YY_BE_2 into master

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskServiceImpl.java

@@ -1487,7 +1487,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 					wmDaDistributionService.updateByApproval(paramMap);
 				} else if ("18".equals(task.getTaskTypeId())) {
 					Map<String, Object> data = (Map<String, Object>) wmDaPharmacyService.approvalPharmacy(task.getId()).getData();
-					WmTask _wmTask = (WmTask) data.get("wmTask");
+					WmTask _wmTask = (WmTask) data.get("_wmTask");
 					Map<String, String> paramMap = MapUtil.newHashMap(4);
 					paramMap.put("approvalInfo", wmTask.getTaskStatusInfo());
 					paramMap.put("approvalOpinion", approvalOpinion);