Merge branch 'feat-calender' into develop

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

@@ -202,7 +202,7 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
                     EngineerCalendarDTO.Content content = new EngineerCalendarDTO.Content();
                     EngineerCalendarDTO.Content content = new EngineerCalendarDTO.Content();
                     content.setPlanId(e.getPlanId());
                     content.setPlanId(e.getPlanId());
                     content.setType("LEAVE");
                     content.setType("LEAVE");
-                    content.setTitle(e.getType());
+                    content.setTitle(e.getReason());
                     content.setValue(getCalendarDuration(e.getStartTime(), e.getEndTime()));
                     content.setValue(getCalendarDuration(e.getStartTime(), e.getEndTime()));
                     content.setPlanId(e.getPlanId());
                     content.setPlanId(e.getPlanId());
                     contents.add(content);
                     contents.add(content);