Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 012f75ff by 丁伟峰
Options

Merge branch 'feature-dingwf-0715' into develop

2 parents 54ef115b 363a2da2
Inline Side-by-side
Showing with 1 additions and 0 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerCalendarServiceImpl.java
...@@ -98,6 +98,7 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService { ...@@ -98,6 +98,7 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
content.setType("rest"); content.setType("rest");
content.setTitle(e.getType()); content.setTitle(e.getType());
content.setValue(getCalendarDuration(e.getStartTime(), e.getEndTime())); content.setValue(getCalendarDuration(e.getStartTime(), e.getEndTime()));
contents.add(content);
} }
calander.setContent(contents); calander.setContent(contents);
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!