Merge branch 'feature_mvp616_wangl' into 'develop'

修改

See merge request !108

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/OrderAssignImpl.java

@@ -163,9 +163,9 @@ public class OrderAssignImpl implements OrderAssign {
 		List<OrderAssignRecommendResp.Timeline> items = new ArrayList<>();
 		List<OrderAssignRecommendResp.Timeline> items = new ArrayList<>();
 		for(OrderAppointment order: orders){
 		for(OrderAppointment order: orders){
 			OrderAssignRecommendResp.Timeline item = new OrderAssignRecommendResp.Timeline();
 			OrderAssignRecommendResp.Timeline item = new OrderAssignRecommendResp.Timeline();
-			item.setStartTime("");
-			item.setEndTime("");
-			item.setType("");
+			item.setStartTime(this.Timestamp2Datetime(order.getExpectStartTime(), "HH:mm"));
+			item.setEndTime(this.Timestamp2Datetime(order.getExpectEndTime(), "HH:mm"));
+			item.setType(order.getStatus());
 
 
 			items.add(item);
 			items.add(item);
 		}
 		}