Merge branch 'feat-calender' into develop

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

@@ -249,6 +249,8 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
             content.setType("REST");
             content.setType("REST");
             content.setTitle("休息");
             content.setTitle("休息");
             calendar.setContent(Collections.singletonList(content));
             calendar.setContent(Collections.singletonList(content));
+        } else {
+            calendar.setContent(new ArrayList<>());
         }
         }
         return calendar;
         return calendar;
     }
     }