Commit d320889d authored by hongguangwu's avatar hongguangwu

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

parents ceae71ba a58b8929
......@@ -292,6 +292,8 @@ public class TSocialDeadlineInfoServiceImpl extends ServiceImpl<TSocialDeadlineI
save = new TSocialDeadlineInfo();
BeanUtil.copyProperties(sd,save);
save.setId(null);
save.setMonth(Integer.parseInt(DateUtil.getThisMonth()));
save.setType(CommonConstants.ZERO_STRING);
initSocialEndDate(holidayMap, save);
initMedicalEndDate(holidayMap, save);
saveList.add(save);
......
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