Commit cb9c9840 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.5.5' into MVP1.5.5

parents 2933262d bdd1aac3
......@@ -421,10 +421,11 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
feedbackDetail.setContractAlertId(changeFeedBackAllVo.getIds()[i]);
feedbackDetail.setFeedbackReason(changeFeedBackAllVo.getFeedbackReason());
feedbackDetail.setFeedbackDetail(changeFeedBackAllVo.getFeedbackDetail());
feedbackDetailMapper.insert(feedbackDetail);
feedbackDetailMapper.insert(feedbackDetail);
}
changeFeedBackAllVo.setFeedbackPerson(user.getNickname());
changeFeedBackAllVo.setFeedbackTime(DateTime.now());
changeFeedBackAllVo.setIsFeedback(CommonConstants.ONE_INTEGER);
changeFeedBackAllVo.setFeedbackPerson(user.getNickname());
changeFeedBackAllVo.setFeedbackTime(DateTime.now());
return baseMapper.changeFeedBackAll(changeFeedBackAllVo);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment