Merge branch 'dev' of http://gitlab.roboming.com/fengzhaoyu/schedule into dev

components/meetingTimePicker/meetingTimePicker.js

@@ -188,10 +188,10 @@ Component({
       const min = endDate.getMinutes();
       endDate.setMinutes(min + 30);
       // 赋值
-      if (this.props.startTime) {
+      if (this.props.startTime && new Date(this.props.startTime).getFullYear()) {
         startDate = new Date(this.props.startTime);
       }
-      if (this.props.endTime) {
+      if (this.props.endTime && new Date(this.props.endTime).getFullYear()) {
         endDate = new Date(this.props.endTime);
       }