Merge branch 'feature-dingwf-0715' into develop

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

@@ -101,9 +101,8 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
                     content.setType("leave");
                     content.setType("leave");
                     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.getContent().add(content);
                 }
                 }
-                calander.setContent(contents);
             }
             }
             calendars.add(calander);
             calendars.add(calander);
         }
         }