Merge branch 'feature-dingwf-0715' into develop

project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerCalendarServiceImpl.java

@@ -98,6 +98,7 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
                     content.setType("rest");
                     content.setTitle(e.getType());
                     content.setValue(getCalendarDuration(e.getStartTime(), e.getEndTime()));
+                    contents.add(content);
                 }
                 calander.setContent(contents);
             }