Merge branch 'dev_bugfix_dispatch' into 'develop'

修复显示时间错误

See merge request !245

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

@@ -177,8 +177,8 @@ public class DispatchServiceImpl implements DispatchService {
 				String key = String.format("%s%s%s", o.getBrand(), o.getType(), o.getSkill());
 				item.setDuration(skillTakeTime.getOrDefault(key, 30));
 
-				String time = TimeUtils.timestamp2DateTime(o.getExpectTimeBegin(), "HH:mm");
-				String timeSlot = this.parseTimeSlot(o.getExpectTimeBegin());
+				String time = TimeUtils.timestamp2DateTime(r.getExpectStartTime(), "HH:mm");
+				String timeSlot = this.parseTimeSlot(r.getExpectStartTime());
 				item.setIntentionTime(String.format("%s/%s", time, timeSlot));
 
 				items.add(item);