Merge branch 'dev_order_info0725' into 'develop'

修改

See merge request !262

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

@@ -146,7 +146,7 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
 			item.setTitle(title);
 			item.setEngineerCode(o.getEngineerCode());
 			item.setExpectTime(TimeUtils.IsoTimestamp2DateTime(o.getExpectTimeBegin()));
-			item.setTimelines(this.packOrderTimeline(timelines.get(o.getSubId())));
+			item.setTimelines(this.packOrderTimeline(timelines.getOrDefault(o.getSubId(), null)));
 			item.setItems(this.packEngineerItems(eg, skill, groups.get(eg.getGroupId())));
 
 			items.add(item);